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
Implemented the 'equivalent' directive for .chr-files.
[idzebra-moved-to-github.git]
/
data1
/
d1_expout.c
diff --git
a/data1/d1_expout.c
b/data1/d1_expout.c
index
ca6862f
..
f51cab0
100644
(file)
--- a/
data1/d1_expout.c
+++ b/
data1/d1_expout.c
@@
-1,6
+1,6
@@
-/* $Id: d1_expout.c,v 1.3 2004-09-28 10:15:03 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: d1_expout.c,v 1.6 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.
@@
-47,12
+47,12
@@
static int is_numeric_tag (ExpHandle *eh, data1_node *c)
return 0;
if (!c->u.tag.element)
{
return 0;
if (!c->u.tag.element)
{
- yaz_log(LOG_WARN, "Tag %s is local", c->u.tag.tag);
+ yaz_log(YLOG_WARN, "Tag %s is local", c->u.tag.tag);
return 0;
}
if (c->u.tag.element->tag->which != DATA1T_numeric)
{
return 0;
}
if (c->u.tag.element->tag->which != DATA1T_numeric)
{
- yaz_log(LOG_WARN, "Tag %s is not numeric", c->u.tag.tag);
+ yaz_log(YLOG_WARN, "Tag %s is not numeric", c->u.tag.tag);
return 0;
}
if (eh->select && !c->u.tag.node_selected)
return 0;
}
if (eh->select && !c->u.tag.node_selected)
@@
-1381,7
+1381,7
@@
Z_ExplainRecord *data1_nodetoexplain (data1_handle dh, data1_node *n,
assert(n->which == DATA1N_root);
if (strcmp(n->u.root.type, "explain"))
{
assert(n->which == DATA1N_root);
if (strcmp(n->u.root.type, "explain"))
{
- yaz_log(LOG_WARN, "Attempt to convert a non-Explain record");
+ yaz_log(YLOG_WARN, "Attempt to convert a non-Explain record");
return 0;
}
for (n = n->child; n; n = n->next)
return 0;
}
for (n = n->child; n; n = n->next)
@@
-1415,6
+1415,6
@@
Z_ExplainRecord *data1_nodetoexplain (data1_handle dh, data1_node *n,
return res;
}
}
return res;
}
}
- yaz_log(LOG_WARN, "No category in Explain record");
+ yaz_log(YLOG_WARN, "No category in Explain record");
return 0;
}
return 0;
}