Directive s=pw sets structure to phrase if term includes blank(s).

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

diff --git a/retrieval/d1_write.c b/retrieval/d1_write.c
index 3cff061..eb64130 100644 (file)
--- a/retrieval/d1_write.c
+++ b/retrieval/d1_write.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_write.c,v $
- * Revision 1.6  1999-07-06 12:16:00  adam
+ * Revision 1.9  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.
+ *
+ * Revision 1.8  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.7  1999/10/21 12:06:29  adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * 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
@@ -28,10 +39,9 @@
  */
 
 #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 +49,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;
 }
@@ -68,8 +78,24 @@ 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));
+#if DATA1_USING_XATTR
+               data1_xattr *p;
+#endif
+               sprintf (line, "%*s<", col, "");
+               wrbuf_puts (b, line);
+               wrbuf_puts (b, tag);
+#if DATA1_USING_XATTR
+               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, '"');
+               }
+#endif
+               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 +118,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 +136,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++;