Better documention in top-level Makefile.

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

diff --git a/retrieval/d1_write.c b/retrieval/d1_write.c
index 66e8b26..29f4ca8 100644 (file)
--- a/retrieval/d1_write.c
+++ b/retrieval/d1_write.c
@@ -1,10 +1,18 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_write.c,v $
- * Revision 1.2  1995-12-13 17:14:27  quinn
+ * 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
@@ -64,8 +72,9 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col)
            int l = c->u.data.len;
            int first = 1;
 
-           if (c->u.data.what == DATA1I_text)
+           switch (c->u.data.what)
            {
+           case DATA1I_text:
                while (l)
                {
                    int wlen;
@@ -109,9 +118,12 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col)
                }
                wrbuf_write(b, "\n", 1);
                col = 0;
-           }
-           else if (c->u.data.what == DATA1I_num)
-           {
+               break;
+           case DATA1I_num:
+               wrbuf_putc(b, ' ');
+               wrbuf_write(b, c->u.data.data, c->u.data.len);
+               break;
+           case DATA1I_oid:
                wrbuf_putc(b, ' ');
                wrbuf_write(b, c->u.data.data, c->u.data.len);
            }
@@ -120,15 +132,12 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col)
     return 0;
 }
 
-char *data1_nodetoidsgml(data1_node *n, int select, int *len)
+char *data1_nodetoidsgml (data1_handle dh, data1_node *n, int select, int *len)
 {
-    static WRBUF b = 0;
+    WRBUF b = data1_get_wrbuf (dh);
     char line[1024];
 
-    if (!b)
-       b = wrbuf_alloc();
-    else
-       wrbuf_rewind(b);
+    wrbuf_rewind(b);
     
     sprintf(line, "<%s>\n", n->u.root.type);
     wrbuf_write(b, line, strlen(line));