X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_write.c;h=bf8b8fe6c4de527833a3b33f580800edadcd6578;hp=6a7d2c05284563da02510fd3c0c0eb6dbfe01964;hb=651ccb74d12f2968e791b3f411a6c55bca68428a;hpb=6517fa53d35512887780fd07de5667940da18a9e

diff --git a/retrieval/d1_write.c b/retrieval/d1_write.c
index 6a7d2c0..bf8b8fe 100644
--- a/retrieval/d1_write.c
+++ b/retrieval/d1_write.c
@@ -1,34 +1,23 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-2002, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: d1_write.c,v $
- * Revision 1.3  1997-09-17 12:10:39  adam
- * YAZ version 1.4.
- *
- * Revision 1.2  1995/12/13 17:14:27  quinn
- * *** empty log message ***
- *
- * Revision 1.1  1995/12/13  15:38:43  quinn
- * Added SGML-output filter.
- *
- *
+ * $Id: d1_write.c,v 1.11 2002-05-13 14:13:37 adam Exp $
  */
 
 #include <string.h>
-#include <ctype.h>
 
-#include <data1.h>
-#include <wrbuf.h>
+#include <yaz/data1.h>
+#include <yaz/wrbuf.h>
 
 #define IDSGML_MARGIN 75
 
-static int wordlen(char *b)
+static int wordlen(char *b, int max)
 {
     int l = 0;
 
-    while (*b && !isspace(*b))
+    while (l < max && !d1_isspace(*b))
 	l++, b++;
     return l;
 }
@@ -46,76 +35,84 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col)
 	{
 	    if (select && c->u.tag.node_selected)
 		continue;
-	    if (c->u.tag.element && c->u.tag.element->tag)
-		tag = c->u.tag.element->tag->names->name; /* first name */
+            tag = c->u.tag.tag;
+	    if (!data1_matchstr(tag, "wellknown")) /* skip wellknown */
+	    {
+		if (nodetoidsgml(c, select, b, col) < 0)
+		    return -1;
+	    }
 	    else
-		tag = c->u.tag.tag; /* local string tag */
-	    if (data1_matchstr(tag, "wellknown")) /* skip wellknown */
 	    {
-		sprintf(line, "<%s>\n", tag);
+		data1_xattr *p;
+
+		sprintf (line, "%*s<", col, "");
+		wrbuf_puts (b, line);
+		wrbuf_puts (b, tag);
+		for (p = c->u.tag.attributes; p; p = p->next)
+		{
+		    wrbuf_putc (b, ' ');
+		    wrbuf_puts (b, p->name);
+		    wrbuf_putc (b, '=');
+		    wrbuf_putc (b, '"');
+		    wrbuf_puts (b, p->value);
+		    wrbuf_putc (b, '"');
+		}
+		wrbuf_puts(b, ">\n");
+		if (nodetoidsgml(c, select, b, (col > 40) ? 40 : col+2) < 0)
+		    return -1;
+		sprintf (line, "%*s</%s>\n", col, "", tag);
 		wrbuf_write(b, line, strlen(line));
-		col = 0;
 	    }
-	    if (nodetoidsgml(c, select, b, col) < 0)
-		return -1;
-	    wrbuf_write(b, "</>\n", 4);
-	    col = 0;
 	}
 	else if (c->which == DATA1N_data)
 	{
 	    char *p = c->u.data.data;
 	    int l = c->u.data.len;
 	    int first = 1;
+	    int lcol = col;
 
-	    if (c->u.data.what == DATA1I_text)
+	    sprintf(line, "%*s", col, "");
+	    wrbuf_write(b, line, strlen(line));
+	    switch (c->u.data.what)
 	    {
+	    case DATA1I_text:
 		while (l)
 		{
 		    int wlen;
-
-		    while (l && isspace(*p))
+		    
+		    while (l && d1_isspace(*p))
 			p++, l--;
 		    if (!l)
 			break;
 		    /* break if we'll cross margin and word is not too long */
-		    if (col + (wlen = wordlen(p)) > IDSGML_MARGIN && wlen <
+		    if (lcol + (wlen = wordlen(p, l)) > IDSGML_MARGIN && wlen <
 			IDSGML_MARGIN)
 		    {
-			sprintf(line, "\n");
-			col = 0;
+			sprintf(line, "\n%*s", col, "");
+			lcol = col;
 			wrbuf_write(b, line, strlen(line));
 			first = 1;
 		    }
 		    if (!first)
 		    {
 			wrbuf_putc(b, ' ');
-			col++;
+			lcol++;
 		    }
-		    while (l && !isspace(*p))
+		    while (l && !d1_isspace(*p))
 		    {
-#if 0
-			if (col > NTOBUF_MARGIN)
-			{
-			    wrbuf_putc(b, '=');
-			    wrbuf_putc(b, '\n');
-			    sprintf(line, "%*s", indent * NTOBUF_INDENT, "");
-			    wrbuf_write(b, line, strlen(line));
-			    col = indent * NTOBUF_INDENT;
-			}
-#endif
 			wrbuf_putc(b, *p);
 			p++;
 			l--;
-			col++;
+			lcol++;
 		    }
 		    first = 0;
 		}
 		wrbuf_write(b, "\n", 1);
-		col = 0;
-	    }
-	    else if (c->u.data.what == DATA1I_num)
-	    {
-		wrbuf_putc(b, ' ');
+		break;
+	    case DATA1I_num:
+		wrbuf_write(b, c->u.data.data, c->u.data.len);
+		break;
+	    case DATA1I_oid:
 		wrbuf_write(b, c->u.data.data, c->u.data.len);
 	    }
 	}
@@ -127,7 +124,7 @@ char *data1_nodetoidsgml (data1_handle dh, data1_node *n, int select, int *len)
 {
     WRBUF b = data1_get_wrbuf (dh);
     char line[1024];
-
+    
     wrbuf_rewind(b);
     
     sprintf(line, "<%s>\n", n->u.root.type);