projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using yaz/test.h. Test for zebra without config
[idzebra-moved-to-github.git]
/
data1
/
d1_grs.c
diff --git
a/data1/d1_grs.c
b/data1/d1_grs.c
index
db9b5d0
..
e295a25
100644
(file)
--- a/
data1/d1_grs.c
+++ b/
data1/d1_grs.c
@@
-1,6
+1,6
@@
-/* $Id: d1_grs.c,v 1.4 2004-09-28 10:15:03 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: d1_grs.c,v 1.7 2005-01-15 19:38:18 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-94,7
+94,7
@@
static Z_Variant *make_variant(data1_node *n, int num, ODR o)
odr_strdup(o, p->u.variant.value);
break;
default:
odr_strdup(o, p->u.variant.value);
break;
default:
- yaz_log(LOG_WARN, "Unable to handle value for variant %s",
+ yaz_log(YLOG_WARN, "Unable to handle value for variant %s",
p->u.variant.type->name);
return 0;
}
p->u.variant.type->name);
return 0;
}
@@
-118,7
+118,7
@@
static int traverse_triples(data1_node *n, int level, Z_ElementMetaData *m,
D1_VARIANTARRAY);
else if (m->num_supportedVariants >= D1_VARIANTARRAY)
{
D1_VARIANTARRAY);
else if (m->num_supportedVariants >= D1_VARIANTARRAY)
{
- yaz_log(LOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)",
+ yaz_log(YLOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)",
D1_VARIANTARRAY);
return -1;
}
D1_VARIANTARRAY);
return -1;
}
@@
-218,7
+218,7
@@
static Z_ElementData *nodetoelementdata(data1_handle dh, data1_node *n,
*len += oid_oidlen(res->u.oid) * sizeof(int);
break;
default:
*len += oid_oidlen(res->u.oid) * sizeof(int);
break;
default:
- yaz_log(LOG_WARN, "Can't handle datatype.");
+ yaz_log(YLOG_WARN, "Can't handle datatype.");
return 0;
}
}
return 0;
}
}
@@
-294,7
+294,7
@@
static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n,
}
else
{
}
else
{
- yaz_log(LOG_WARN, "Bad data.");
+ yaz_log(YLOG_WARN, "Bad data.");
return 0;
}
return 0;
}
@@
-392,7
+392,7
@@
Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n,
data1_gettagbyname (dh, n->root->u.root.absyn->tagset,
"wellKnown")))
{
data1_gettagbyname (dh, n->root->u.root.absyn->tagset,
"wellKnown")))
{
- yaz_log(LOG_WARN, "Unable to locate tag for 'wellKnown'");
+ yaz_log(YLOG_WARN, "Unable to locate tag for 'wellKnown'");
wellknown_tag = odr_malloc(o, sizeof(*wellknown_tag));
wellknown_tag->which = DATA1T_numeric;
wellknown_tag->value.numeric = 19;
wellknown_tag = odr_malloc(o, sizeof(*wellknown_tag));
wellknown_tag->which = DATA1T_numeric;
wellknown_tag->value.numeric = 19;