XML reader for data1 (EXPAT)

[yaz-moved-to-github.git] / retrieval / d1_write.c

diff --git a/retrieval/d1_write.c b/retrieval/d1_write.c
index 3cff061..bf8b8fe 100644 (file)
--- a/retrieval/d1_write.c
+++ b/retrieval/d1_write.c
@@ -1,37 +1,15 @@
 /*
- * Copyright (c) 1995-1999, 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.6  1999-07-06 12:16:00  adam
- * Improved layout generated record in SGML/XML format.
- *
- * Revision 1.5  1998/06/05 08:57:43  adam
- * Fixed problem with function wordlen.
- *
- * Revision 1.4  1998/05/18 13:07:08  adam
- * Changed the way attribute sets are handled by the retriaval module.
- * Extended Explain conversion / schema.
- * Modified server and client to work with ASN.1 compiled protocol handlers.
- *
- * 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
 
@@ -39,7 +17,7 @@ static int wordlen(char *b, int max)
 {
     int l = 0;
 
-    while (l < max && !isspace(*b))
+    while (l < max && !d1_isspace(*b))
        l++, b++;
     return l;
 }
@@ -57,10 +35,7 @@ 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 */
-           else
-               tag = c->u.tag.tag; /* local string tag */
+            tag = c->u.tag.tag;
            if (!data1_matchstr(tag, "wellknown")) /* skip wellknown */
            {
                if (nodetoidsgml(c, select, b, col) < 0)
@@ -68,8 +43,21 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col)
            }
            else
            {
-               sprintf(line, "%*s<%s>\n", col, "", tag);
-               wrbuf_write(b, line, strlen(line));
+               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);
@@ -92,7 +80,7 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col)
                {
                    int wlen;
                    
-                   while (l && isspace(*p))
+                   while (l && d1_isspace(*p))
                        p++, l--;
                    if (!l)
                        break;
@@ -110,7 +98,7 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col)
                        wrbuf_putc(b, ' ');
                        lcol++;
                    }
-                   while (l && !isspace(*p))
+                   while (l && !d1_isspace(*p))
                    {
                        wrbuf_putc(b, *p);
                        p++;