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
Comment node. Extra root level for XML parsed data1
[yaz-moved-to-github.git]
/
retrieval
/
d1_grs.c
diff --git
a/retrieval/d1_grs.c
b/retrieval/d1_grs.c
index
d686b08
..
774b188
100644
(file)
--- a/
retrieval/d1_grs.c
+++ b/
retrieval/d1_grs.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_grs.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_grs.c,v $
- * Revision 1.18 2002-04-12 14:40:07 adam
+ * Revision 1.20 2002-05-13 14:13:37 adam
+ * XML reader for data1 (EXPAT)
+ *
+ * Revision 1.19 2002/04/15 09:06:30 adam
+ * Fix explain tags for XML writer
+ *
+ * Revision 1.18 2002/04/12 14:40:07 adam
* GRS-1 writer accepts non-abs
*
* Revision 1.17 1999/11/30 13:47:12 adam
* GRS-1 writer accepts non-abs
*
* Revision 1.17 1999/11/30 13:47:12 adam
@@
-201,7
+207,7
@@
static Z_ElementData *nodetoelementdata(data1_handle dh, data1_node *n,
break;
case DATA1I_text:
toget = n->u.data.len;
break;
case DATA1I_text:
toget = n->u.data.len;
- if (p->u.tag.get_bytes > 0 && p->u.tag.get_bytes < toget)
+ if (p && p->u.tag.get_bytes > 0 && p->u.tag.get_bytes < toget)
toget = p->u.tag.get_bytes;
res->which = Z_ElementData_string;
res->u.string = (char *)odr_malloc(o, toget+1);
toget = p->u.tag.get_bytes;
res->which = Z_ElementData_string;
res->u.string = (char *)odr_malloc(o, toget+1);
@@
-286,7
+292,7
@@
static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n,
else if (tag)
tagstr = tag->value.string; /* no take from well-known */
else
else if (tag)
tagstr = tag->value.string; /* no take from well-known */
else
- tagstr = "?"; /* no tag at all! */
+ tagstr = "???"; /* no tag at all! */
res->tagValue->which = Z_StringOrNumeric_string;
res->tagValue->u.string = odr_strdup(o, tagstr);
}
res->tagValue->which = Z_StringOrNumeric_string;
res->tagValue->u.string = odr_strdup(o, tagstr);
}