X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmarcdisp.c;h=171e5a3dff1264acb944a34bea00ea550a493e85;hb=537450adf56c59b3f26ac9320cc6dd12b3ffdbb5;hp=7dbb7eaab3668b56f18df3e9e34fc5a7c2c7773a;hpb=6ad80c673e9591ae178154cfe2ce002834cfdafd;p=yaz-moved-to-github.git

diff --git a/src/marcdisp.c b/src/marcdisp.c
index 7dbb7ea..171e5a3 100644
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: marcdisp.c,v 1.2 2003-12-11 00:37:22 adam Exp $
+ * $Id: marcdisp.c,v 1.7 2004-10-01 11:45:48 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -43,56 +43,12 @@ void yaz_marc_destroy(yaz_marc_t mt)
 
 static void marc_cdata (yaz_marc_t mt, const char *buf, size_t len, WRBUF wr)
 {
-    size_t i;
     if (mt->xml == YAZ_MARC_ISO2709)
-    {
 	wrbuf_iconv_write(wr, mt->iconv_cd, buf, len);
-    }
     else if (mt->xml == YAZ_MARC_LINE)
-    {
 	wrbuf_iconv_write(wr, mt->iconv_cd, buf, len);
-    }
     else
-    {
-	int j = 0;
-	for (i = 0; i<len; i++)
-	{
-	    switch (buf[i]) {
-	    case '<':
-		if (i > j)
-		    wrbuf_iconv_write(wr, mt->iconv_cd, buf+j, i-j);
-		wrbuf_puts(wr, "&lt;");
-		j=i+1;
-		break;
-	    case '>':
-		if (i > j)
-		    wrbuf_iconv_write(wr, mt->iconv_cd, buf+j, i-j);
-		wrbuf_puts(wr, "&gt;");
-		j=i+1;
-		break;
-	    case '&':
-		if (i > j)
-		    wrbuf_iconv_write(wr, mt->iconv_cd, buf+j, i-j);
-		wrbuf_puts(wr, "&amp;");
-		j=i+1;
-                break;
-	    case '"':
-		if (i > j)
-		    wrbuf_iconv_write(wr, mt->iconv_cd, buf+j, i-j);
-		wrbuf_puts(wr, "&quot;");
-		j=i+1;
-		break;
-	    case '\'':
-		if (i > j)
-		    wrbuf_iconv_write(wr, mt->iconv_cd, buf+j, i-j);
-		wrbuf_puts(wr, "&apos;");
-		j=i+1;
-		break;
-            }
-	}
-	if (i > j)
-	    wrbuf_iconv_write(wr, mt->iconv_cd, buf+j, i-j);
-    }
+	wrbuf_iconv_write_cdata(wr, mt->iconv_cd, buf, len);
 }
 
 int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
@@ -177,7 +133,15 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
             wrbuf_printf(
                 wr,
                 "<record xmlns=\"http://www.loc.gov/MARC21/slim\">\n"
-                "  <leader>%.24s</leader>\n", buf);
+                "  <leader>");
+#if 1
+	    marc_cdata(mt, buf, 9, wr);
+	    marc_cdata(mt, "a", 1, wr);  /* set leader to signal unicode */
+	    marc_cdata(mt, buf+10, 14, wr);
+#else
+	    marc_cdata(mt, buf, 24, wr); /* leave header as is .. */
+#endif
+            wrbuf_printf(wr, "</leader>\n");
             break;
         }
     }
@@ -212,6 +176,11 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
         if (entry_p >= record_length)
             return -1;
     }
+    if (mt->debug && base_address != entry_p+1)
+    {
+	wrbuf_printf (wr,"  <!-- base address not at end of directory "
+		      "base=%d end=%d -->\n", base_address, entry_p+1);
+    }
     base_address = entry_p+1;
 
     if (mt->xml == YAZ_MARC_ISO2709)
@@ -302,19 +271,25 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
             wrbuf_puts (wr, " ");
             break;
         case YAZ_MARC_SIMPLEXML:
-            wrbuf_printf (wr, "<field tag=\"%s\"", tag);
+            wrbuf_printf (wr, "<field tag=\"");
+	    marc_cdata(mt, tag, strlen(tag), wr);
+	    wrbuf_printf(wr, "\"");
             break;
         case YAZ_MARC_OAIMARC:
             if (identifier_flag)
-                wrbuf_printf (wr, "  <varfield id=\"%s\"", tag);
+                wrbuf_printf (wr, "  <varfield id=\"");
             else
-                wrbuf_printf (wr, "  <fixfield id=\"%s\"", tag);
+                wrbuf_printf (wr, "  <fixfield id=\"");
+	    marc_cdata(mt, tag, strlen(tag), wr);
+	    wrbuf_printf(wr, "\"");
             break;
         case YAZ_MARC_MARCXML:
             if (identifier_flag)
-                wrbuf_printf (wr, "  <datafield tag=\"%s\"", tag);
+                wrbuf_printf (wr, "  <datafield tag=\"");
             else
-                wrbuf_printf (wr, "  <controlfield tag=\"%s\"", tag);
+                wrbuf_printf (wr, "  <controlfield tag=\"");
+	    marc_cdata(mt, tag, strlen(tag), wr);
+	    wrbuf_printf(wr, "\"");
         }
         
         if (identifier_flag)
@@ -332,13 +307,19 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
                     wrbuf_putc(wr, buf[i]);
                     break;
                 case YAZ_MARC_SIMPLEXML:
-                    wrbuf_printf(wr, " Indicator%d=\"%c\"", j+1, buf[i]);
+                    wrbuf_printf(wr, " Indicator%d=\"", j+1);
+		    marc_cdata(mt, buf+i, 1, wr);
+                    wrbuf_printf(wr, "\"");
                     break;
                 case YAZ_MARC_OAIMARC:
-                    wrbuf_printf(wr, " i%d=\"%c\"", j+1, buf[i]);
+                    wrbuf_printf(wr, " i%d=\"", j+1);
+		    marc_cdata(mt, buf+i, 1, wr);
+                    wrbuf_printf(wr, "\"");
                     break;
                 case YAZ_MARC_MARCXML:
-                    wrbuf_printf(wr, " ind%d=\"%c\"", j+1, buf[i]);
+                    wrbuf_printf(wr, " ind%d=\"", j+1);
+		    marc_cdata(mt, buf+i, 1, wr);
+                    wrbuf_printf(wr, "\"");
                 }
             }
 	}
@@ -370,26 +351,26 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
 		    break;
                 case YAZ_MARC_LINE: 
                     wrbuf_puts (wr, " $"); 
-                    for (j = 1; j<identifier_length; j++, i++)
-                        wrbuf_putc (wr, buf[i]);
+		    marc_cdata(mt, buf+i, identifier_length-1, wr);
+		    i = i+identifier_length-1;
                     wrbuf_putc (wr, ' ');
                     break;
                 case YAZ_MARC_SIMPLEXML:
                     wrbuf_puts (wr, "  <subfield code=\"");
-                    for (j = 1; j<identifier_length; j++, i++)
-                        wrbuf_putc (wr, buf[i]);
+		    marc_cdata(mt, buf+i, identifier_length-1, wr);
+		    i = i+identifier_length-1;
                     wrbuf_puts (wr, "\">");
                     break;
                 case YAZ_MARC_OAIMARC:
                     wrbuf_puts (wr, "    <subfield label=\"");
-                    for (j = 1; j<identifier_length; j++, i++)
-                        wrbuf_putc (wr, buf[i]);
+		    marc_cdata(mt, buf+i, identifier_length-1, wr);
+		    i = i+identifier_length-1;
                     wrbuf_puts (wr, "\">");
                     break;
                 case YAZ_MARC_MARCXML:
                     wrbuf_puts (wr, "    <subfield code=\"");
-                    for (j = 1; j<identifier_length; j++, i++)
-                        wrbuf_putc (wr, buf[i]);
+		    marc_cdata(mt, buf+i, identifier_length-1, wr);
+		    i = i+identifier_length-1;
                     wrbuf_puts (wr, "\">");
                     break;
                 }