projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 5.9.0
[yaz-moved-to-github.git]
/
src
/
grs1disp.c
diff --git
a/src/grs1disp.c
b/src/grs1disp.c
index
dc5a5bd
..
429e9fe
100644
(file)
--- a/
src/grs1disp.c
+++ b/
src/grs1disp.c
@@
-1,17
+1,18
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
/**
* \file grs1disp.c
* \brief Implements display of GRS-1 records
*/
/**
* \file grs1disp.c
* \brief Implements display of GRS-1 records
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <ctype.h>
#include <yaz/proto.h>
#include <yaz/oid_db.h>
#include <yaz/proto.h>
#include <yaz/oid_db.h>
@@
-22,12
+23,14
@@
static void display_variant(WRBUF w, Z_Variant *v, int level)
for (i = 0; i < v->num_triples; i++)
{
for (i = 0; i < v->num_triples; i++)
{
- printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass,
- *v->triples[i]->type);
+ wrbuf_printf(w, "%*sclass=" ODR_INT_PRINTF ",type=" ODR_INT_PRINTF,
+ level * 4, "", *v->triples[i]->zclass,
+ *v->triples[i]->type);
if (v->triples[i]->which == Z_Triple_internationalString)
if (v->triples[i]->which == Z_Triple_internationalString)
- printf(",value=%s\n", v->triples[i]->value.internationalString);
+ wrbuf_printf(w, ",value=%s\n",
+ v->triples[i]->value.internationalString);
else
else
- printf("\n");
+ wrbuf_printf(w, "\n");
}
}
}
}
@@
-47,11
+50,11
@@
static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
t = r->elements[i];
wrbuf_printf(w, "(");
if (t->tagType)
t = r->elements[i];
wrbuf_printf(w, "(");
if (t->tagType)
- wrbuf_printf(w, "%d,", *t->tagType);
+ wrbuf_printf(w, ODR_INT_PRINTF ",", *t->tagType);
else
wrbuf_printf(w, "?,");
if (t->tagValue->which == Z_StringOrNumeric_numeric)
else
wrbuf_printf(w, "?,");
if (t->tagValue->which == Z_StringOrNumeric_numeric)
- wrbuf_printf(w, "%d) ", *t->tagValue->u.numeric);
+ wrbuf_printf(w, ODR_INT_PRINTF ") ", *t->tagValue->u.numeric);
else
wrbuf_printf(w, "%s) ", t->tagValue->u.string);
if (t->content->which == Z_ElementData_subtree)
else
wrbuf_printf(w, "%s) ", t->tagValue->u.string);
if (t->content->which == Z_ElementData_subtree)
@@
-71,7
+74,7
@@
static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
}
else if (t->content->which == Z_ElementData_numeric)
{
}
else if (t->content->which == Z_ElementData_numeric)
{
- wrbuf_printf(w, "%d\n", *t->content->u.numeric);
+ wrbuf_printf(w, ODR_INT_PRINTF "\n", *t->content->u.numeric);
}
else if (t->content->which == Z_ElementData_oid)
{
}
else if (t->content->which == Z_ElementData_oid)
{
@@
-81,9
+84,9
@@
static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
{
char oid_name_str[OID_STR_MAX];
oid_class oclass;
{
char oid_name_str[OID_STR_MAX];
oid_class oclass;
- const char *oid_name
+ const char *oid_name
= yaz_oid_to_string_buf(ip, &oclass, oid_name_str);
= yaz_oid_to_string_buf(ip, &oclass, oid_name_str);
-
+
if (oid_name)
wrbuf_printf(w, "OID: %s\n", oid_name);
}
if (oid_name)
wrbuf_printf(w, "OID: %s\n", oid_name);
}
@@
-100,7
+103,7
@@
static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
{
printf ("External\n");
/* we cannot print externals here. Srry */
{
printf ("External\n");
/* we cannot print externals here. Srry */
- }
+ }
else
wrbuf_printf(w, "? type = %d\n",t->content->which);
if (t->appliedVariant)
else
wrbuf_printf(w, "? type = %d\n",t->content->which);
if (t->appliedVariant)
@@
-121,12
+124,13
@@
static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags)
{
void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags)
{
- display_grs1 (wrbuf, r, 0);
+ display_grs1(wrbuf, r, 0);
}
/*
* Local variables:
* c-basic-offset: 4
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab