X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=retrieval%2Fd1_read.c;h=8ff1563c5be3985fbb0048e974f09c37bc5fd5ed;hb=548d8ab9b0b5930db27643b47fc55afce5511219;hp=a2753415569c2eacc237b9493bc07bba2c16f907;hpb=43801085d371c69455730182f72c4e53d8c8218f;p=yaz-moved-to-github.git
diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index a275341..8ff1563 100644
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -1,10 +1,16 @@
/*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2000, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_read.c,v $
- * Revision 1.33 2000-11-29 14:22:47 adam
+ * Revision 1.35 2000-12-05 14:44:25 adam
+ * Readers skips sections.
+ *
+ * Revision 1.34 2000/12/05 10:06:23 adam
+ * Added support for null-data rules like .
+ *
+ * Revision 1.33 2000/11/29 14:22:47 adam
* Implemented XML/SGML attributes for data1 so that d1_read reads them
* and d1_write generates proper attributes for XML/SGML records. Added
* register locking for threaded version.
@@ -416,10 +422,30 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
#endif
char tag[64];
char args[256];
- size_t i;
- for (i = 0; (c=(*get_byte)(fh)) && c != '>' && !d1_isspace(c);)
+ int null_tag = 0;
+ int end_tag = 0;
+ size_t i = 0;
+
+ c = (*get_byte)(fh);
+ if (c == '/')
+ {
+ end_tag = 1;
+ c = (*get_byte)(fh);
+ }
+ else if (c == '!') /* tags/comments that we don't deal with yet */
+ {
+ while (c && c != '>')
+ c = (*get_byte)(fh);
+ if (c)
+ c = (*get_byte)(fh);
+ continue;
+ }
+ while (c && c != '>' && c != '/' && !d1_isspace(c))
+ {
if (i < (sizeof(tag)-1))
tag[i++] = c;
+ c = (*get_byte)(fh);
+ }
tag[i] = '\0';
#if DATA1_USING_XATTR
xattr = data1_read_xattr (dh, m, get_byte, fh, wrbuf, &c);
@@ -427,11 +453,16 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
#else
while (d1_isspace(c))
c = (*get_byte)(fh);
- for (i = 0; c && c != '>'; c = (*get_byte)(fh))
+ for (i = 0; c && c != '>' && c != '/'; c = (*get_byte)(fh))
if (i < (sizeof(args)-1))
args[i++] = c;
args[i] = '\0';
#endif
+ if (c == '/')
+ { /* or */
+ null_tag = 1;
+ c = (*get_byte)(fh);
+ }
if (c != '>')
{
yaz_log(LOG_WARN, "d1: %d: Malformed tag", line);
@@ -441,9 +472,9 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
c = (*get_byte)(fh);
/* End tag? */
- if (*tag == '/')
+ if (end_tag)
{
- if (tag[1] == '\0')
+ if (*tag == '\0')
--level; /* > */
else
{ /* */
@@ -452,9 +483,9 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
{
parent = d1_stack[--i];
if ((parent->which == DATA1N_root &&
- !strcmp(tag+1, parent->u.root.type)) ||
+ !strcmp(tag, parent->u.root.type)) ||
(parent->which == DATA1N_tag &&
- !strcmp(tag+1, parent->u.tag.tag)))
+ !strcmp(tag, parent->u.tag.tag)))
{
level = i;
break;
@@ -561,7 +592,9 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
else if (parent)
parent->child = res;
d1_stack[level] = res;
- d1_stack[++level] = 0;
+ d1_stack[level+1] = 0;
+ if (!null_tag)
+ ++level;
}
else /* != '<'... this is a body of text */
{