X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fdanbibr.c;h=6459d988604b6704d5fc858d0f915ce64fac5c93;hb=b5eb8cd7ae4134d915ed8b4aec25ab90c8bd0dcb;hp=1b160af41bf400d74df84e27d735edbff6f9799c;hpb=f456ec59032877bdf30c3c7432a11a003020c01e;p=idzebra-moved-to-github.git

diff --git a/recctrl/danbibr.c b/recctrl/danbibr.c
index 1b160af..6459d98 100644
--- a/recctrl/danbibr.c
+++ b/recctrl/danbibr.c
@@ -1,4 +1,4 @@
-/* $Id: danbibr.c,v 1.1 2004-05-21 11:58:56 adam Exp $
+/* $Id: danbibr.c,v 1.4 2004-05-26 13:47:08 adam Exp $
    Copyright (C) 2004
    Index Data Aps
 
@@ -84,11 +84,12 @@ static int read_rec(struct grs_read_info *p)
 static data1_node *mk_tree(struct grs_read_info *p, const char *rec_buf)
 {
     data1_node *root = data1_mk_root(p->dh, p->mem, "danbib");
+    data1_node *root_tag = data1_mk_tag(p->dh, p->mem, "danbib", 0, root);
     const char *cp = rec_buf;
 
     if (1)  /* <text> all </text> */
     {
-	data1_node *text_node = data1_mk_tag(p->dh, p->mem, "text", 0, root);
+	data1_node *text_node = data1_mk_tag(p->dh, p->mem, "text", 0, root_tag);
 	data1_mk_text_n(p->dh, p->mem, rec_buf, strlen(rec_buf), text_node);
     }
     while (*cp)
@@ -100,7 +101,7 @@ static data1_node *mk_tree(struct grs_read_info *p, const char *rec_buf)
 	    cp++;
 	    continue;
 	}
-	if (*cp == ' ')  /* continuation */
+	else if (*cp == ' ')  /* bad continuation */
 	{
 	    while (*cp && *cp != '\n')
 		cp++;
@@ -119,7 +120,7 @@ static data1_node *mk_tree(struct grs_read_info *p, const char *rec_buf)
 			data1_node *hnode;
 			sprintf(elemstr, "head%d", no);
 
-			hnode = data1_mk_tag(p->dh, p->mem, elemstr, 0, root);
+			hnode = data1_mk_tag(p->dh, p->mem, elemstr, 0, root_tag);
 			data1_mk_text_n(p->dh, p->mem, start_text,
 					cp - start_text, hnode);
 			start_text = cp+1;
@@ -135,7 +136,7 @@ static data1_node *mk_tree(struct grs_read_info *p, const char *rec_buf)
 	    {
 		data1_node *tag_node =
 		    data1_mk_tag_n(p->dh, p->mem,
-				   start_tag, cp - start_tag, 0, root);
+				   start_tag, cp - start_tag, 0, root_tag);
 		cp++;
 		start_text = cp;
 		while (*cp != '\n' && *cp)
@@ -151,8 +152,25 @@ static data1_node *mk_tree(struct grs_read_info *p, const char *rec_buf)
 			    data1_mk_tag_n(p->dh, p->mem, cp, 1, 0, tag_node);
 			cp++;
 			start_text = cp;
-			while (*cp && *cp != '\n'&& *cp != '*')
-			    cp++;
+			while (*cp)
+			{
+			    if (*cp == '\n' && cp[1] == ' ')
+			    {
+				cp++;
+				if (start_text != cp)
+				    data1_mk_text_n(p->dh, p->mem, start_text,
+						    cp-start_text, sub_tag_node);
+				while (*cp == ' ')
+				    cp++;
+				start_text = cp;
+			    }
+			    else if (*cp == '\n')
+				break;
+			    else if (*cp == '*')
+				break;
+			    else
+				cp++;
+			}
 			if (start_text != cp)
 			    data1_mk_text_n(p->dh, p->mem, start_text,
 					    cp-start_text, sub_tag_node);