X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_write.c;h=cecc25fff6399a4013f94a1ee1cf822dccce6adc;hb=96f2ba71b5c9042a90ca94ea84a79cd89a2957d5;hp=587e75d2c809b8ed74575db2cb6dac7ef42b0744;hpb=519fefb91135ad52134b9fc4e82b3874f5525a2b;p=idzebra-moved-to-github.git

diff --git a/data1/d1_write.c b/data1/d1_write.c
index 587e75d..cecc25f 100644
--- a/data1/d1_write.c
+++ b/data1/d1_write.c
@@ -1,14 +1,30 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: d1_write.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* $Id: d1_write.c,v 1.6 2005-01-15 19:38:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+/* converts data1 tree to XML record */
 
 #include <string.h>
 
-#include <data1.h>
+#include <idzebra/data1.h>
 #include <yaz/wrbuf.h>
 
 #define IDSGML_MARGIN 75
@@ -31,40 +47,6 @@ static void indent (WRBUF b, int col)
         wrbuf_putc (b, ' ');
 }
 
-static void wrbuf_write_cdata(WRBUF b, const char *msg, int len)
-{
-    int i;
-
-    for (i = 0; i < len; i++)
-    {
-        switch (msg[i])
-        {
-        case '"':
-            wrbuf_puts (b, "&quot;");
-            break;
-        case '\'':
-            wrbuf_puts (b, "&apos;");
-            break;
-        case '>':
-            wrbuf_puts (b, "&gt;");
-            break;
-        case '<':
-            wrbuf_puts (b, "&lt;");
-            break;
-        case '&':
-            wrbuf_puts (b, "&amp;");
-            break;
-        default:
-            wrbuf_putc(b, msg[i]);
-        }
-    }
-}
-
-static void wrbuf_put_cdata(WRBUF b, const char *msg)
-{
-    wrbuf_write_cdata (b, msg, strlen(msg));
-}
-
 static void wrbuf_put_xattr(WRBUF b, data1_xattr *p)
 {
     for (; p; p = p->next)
@@ -73,13 +55,13 @@ static void wrbuf_put_xattr(WRBUF b, data1_xattr *p)
         if (p->what == DATA1I_xmltext)
             wrbuf_puts (b, p->name);
         else
-            wrbuf_put_cdata (b, p->name);
+            wrbuf_xmlputs (b, p->name);
         if (p->value)
         {
             wrbuf_putc (b, '=');
             wrbuf_putc (b, '"');
             if (p->what == DATA1I_text)
-                wrbuf_put_cdata (b, p->value);
+                wrbuf_xmlputs (b, p->value);
             else
                 wrbuf_puts (b, p->value);
             wrbuf_putc (b, '"');
@@ -98,12 +80,10 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col,
 
         if (c->which == DATA1N_preprocess)
         {
-            data1_xattr *p;
-
             if (pretty_format)
                 indent (b, col);
 	    wrbuf_puts (b, "<?");
-            wrbuf_put_cdata (b, c->u.preprocess.target);
+            wrbuf_xmlputs (b, c->u.preprocess.target);
             wrbuf_put_xattr (b, c->u.preprocess.attributes);
             if (c->child)
                 wrbuf_puts(b, " ");
@@ -124,12 +104,10 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col,
 	    }
 	    else
 	    {
-		data1_xattr *p;
-
                 if (pretty_format)
                     indent (b, col);
 		wrbuf_puts (b, "<");	
-		wrbuf_put_cdata (b, tag);
+		wrbuf_xmlputs (b, tag);
                 wrbuf_put_xattr (b, c->u.tag.attributes);
 		wrbuf_puts(b, ">");
                 if (pretty_format)
@@ -140,7 +118,7 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col,
                 if (pretty_format)
                     indent (b, col);
 		wrbuf_puts(b, "</");
-		wrbuf_put_cdata(b, tag);
+		wrbuf_xmlputs(b, tag);
 		wrbuf_puts(b, ">");
                 if (pretty_format)
                     wrbuf_puts (b, "\n");
@@ -165,7 +143,7 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col,
 	    case DATA1I_text:
                 if (!pretty_format || c->u.data.formatted_text)
                 {
-                    wrbuf_write_cdata (b, p, l);
+                    wrbuf_xmlputs_n (b, p, l);
                 }
                 else
                 {
@@ -204,12 +182,12 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col,
                 }
 		break;
 	    case DATA1I_num:
-		wrbuf_write_cdata(b, c->u.data.data, c->u.data.len);
+		wrbuf_xmlputs_n(b, c->u.data.data, c->u.data.len);
                 if (pretty_format)
                     wrbuf_puts(b, "\n");
 		break;
 	    case DATA1I_oid:
-		wrbuf_write_cdata(b, c->u.data.data, c->u.data.len);
+		wrbuf_xmlputs_n(b, c->u.data.data, c->u.data.len);
                 if (pretty_format)
                     wrbuf_puts(b, "\n");
 	    }