YAZ version 1.4.

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

diff --git a/retrieval/d1_sutrs.c b/retrieval/d1_sutrs.c
index be255a2..504007f 100644 (file)
--- a/retrieval/d1_sutrs.c
+++ b/retrieval/d1_sutrs.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_sutrs.c,v $
- * Revision 1.2  1995-11-01 13:54:49  quinn
+ * Revision 1.4  1997-09-17 12:10:38  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.3  1995/12/15 16:57:11  quinn
+ * Added formatted-text.
+ *
+ * Revision 1.2  1995/11/01  13:54:49  quinn
  * Minor adjustments
  *
  * Revision 1.1  1995/11/01  11:56:09  quinn
@@ -15,8 +21,6 @@
 
 #include <ctype.h>
 
-#include <wrbuf.h>
-
 #include <data1.h>
 
 #define NTOBUF_INDENT   2
@@ -65,7 +69,15 @@ static int nodetobuf(data1_node *n, int select, WRBUF b, int indent, int col)
            int l = c->u.data.len;
            int first = 0;
 
-           if (c->u.data.what == DATA1I_text)
+           if (c->u.data.what == DATA1I_text && c->u.data.formatted_text)
+           {
+               wrbuf_putc(b, '\n');
+               wrbuf_write(b, c->u.data.data, c->u.data.len);
+               sprintf(line, "%*s", indent * NTOBUF_INDENT, "");
+               wrbuf_write(b, line, strlen(line));
+               col = indent * NTOBUF_INDENT;
+           }
+           else if (c->u.data.what == DATA1I_text)
            {
                while (l)
                {
@@ -123,14 +135,11 @@ static int nodetobuf(data1_node *n, int select, WRBUF b, int indent, int col)
  * need changing.
  */
 
-char *data1_nodetobuf(data1_node *n, int select, int *len)
+char *data1_nodetobuf (data1_handle dh, data1_node *n, int select, int *len)
 {
-    static WRBUF b = 0;
+    WRBUF b = data1_get_wrbuf (dh);
 
-    if (!b)
-       b = wrbuf_alloc();
-    else
-       wrbuf_rewind(b);
+    wrbuf_rewind(b);
     if (nodetobuf(n, select, b, 0, 0))
        return 0;
     wrbuf_putc(b, '\n');