X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=0af749251df77c3602e5943a91ce0708c260e2ee;hb=3ee667935c4cac82445ecd05c8ae421888dfd40f;hp=289a7514e47ed58eade509961b298c25c9a411e3;hpb=99fef536b882e1a7e8fae9955ff8c28bfe171e9c;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index 289a751..0af7492 100644
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1995-2000, Index Data.
+ * Copyright (c) 1995-2001, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_read.c,v $
- * Revision 1.34  2000-12-05 10:06:23  adam
+ * Revision 1.38  2001-03-27 23:06:21  adam
+ * Quotes and slashes may occur within attributes.
+ *
+ * Revision 1.37  2001/02/28 09:00:06  adam
+ * Fixed problem with stack overflow for very nested records.
+ *
+ * Revision 1.36  2001/02/21 13:46:53  adam
+ * C++ fixes.
+ *
+ * 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 <tag/>.
  *
  * Revision 1.33  2000/11/29 14:22:47  adam
@@ -345,7 +357,7 @@ data1_xattr *data1_read_xattr (data1_handle dh, NMEM m,
 	    c = (*get_byte)(fh);
 	if (!c  || c == '>' || c == '/')
 	    break;
-	*pp = p = nmem_malloc (m, sizeof(*p));
+	*pp = p = (data1_xattr *) nmem_malloc (m, sizeof(*p));
 	p->next = 0;
 	pp = &p->next;
 	p->value = 0;
@@ -358,25 +370,36 @@ data1_xattr *data1_read_xattr (data1_handle dh, NMEM m,
 	}
 	wrbuf_putc (wrbuf, '\0');
 	len = wrbuf_len(wrbuf);
-	p->name = nmem_malloc (m, len);
+	p->name = (char*) nmem_malloc (m, len);
 	strcpy (p->name, wrbuf_buf(wrbuf));
 	if (c == '=')
 	{
 	    c = (*get_byte)(fh);
 	    if (c == '"')
-		c = (*get_byte)(fh);	
-	    wrbuf_rewind(wrbuf);
-	    while (c && c != '"' && c != '>' && c != '/')
 	    {
-		wrbuf_putc (wrbuf, c);
-		c = (*get_byte)(fh);
+		c = (*get_byte)(fh);	
+		wrbuf_rewind(wrbuf);
+		while (c && c != '"')
+		{
+		    wrbuf_putc (wrbuf, c);
+		    c = (*get_byte)(fh);
+	        }
+	        if (c)
+		    c = (*get_byte)(fh);	
 	    }
+	    else
+	    {
+	        wrbuf_rewind(wrbuf);
+	        while (c && c != '>' && c != '/')
+	        {
+		    wrbuf_putc (wrbuf, c);
+		    c = (*get_byte)(fh);
+	        }
+            }
 	    wrbuf_putc (wrbuf, '\0');
 	    len = wrbuf_len(wrbuf);
-	    p->value = nmem_malloc (m, len);
+	    p->value = (char*) nmem_malloc (m, len);
 	    strcpy (p->value, wrbuf_buf(wrbuf));
-	    if (c == '"')
-		c = (*get_byte)(fh);	
 	}
     }
     *ch = c;
@@ -429,6 +452,14 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 		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))
@@ -582,7 +613,7 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 		parent->child = res;
 	    d1_stack[level] = res;
 	    d1_stack[level+1] = 0;
-	    if (!null_tag)
+	    if (level < 250 && !null_tag)
 		++level;
 	}
 	else /* != '<'... this is a body of text */