X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdisp.c;h=235f0405fe474ca36a722aacdad05a3898685665;hb=58b2fdadbb7b8a8845ff67501520fe1660dedeee;hp=78b48337ed34281a7fb90b48a5ffdea33919456f;hpb=50319ad67f5bae49fc9449bd6105dfa357f2dbb3;p=yaz-moved-to-github.git

diff --git a/util/marcdisp.c b/util/marcdisp.c
index 78b4833..235f040 100644
--- a/util/marcdisp.c
+++ b/util/marcdisp.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: marcdisp.c,v 1.21 2002-10-04 10:19:58 adam Exp $
+ * $Id: marcdisp.c,v 1.23 2002-10-04 19:11:17 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -64,19 +64,15 @@ int yaz_marc_decode (const char *buf, WRBUF wr, int debug, int bsize, int xml)
         {
             wrbuf_puts(
                 wr,
-                "<sequence xmlns=\"http://www.dlib.vt.edu/projects/OAi/marcxml/container\"\n"
-                
-                "  xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\"\n"
-                "    xsi:schemaLocation=\"http://www.openarchives.org/OAI/oai_marc\n"
-                "    http://www.openarchives.org/OAI/oai_marc.xsd\n"
-                "    http://www.dlib.vt.edu/projects/OAi/marcxml/container\n"
-                "    http://www.dlib.vt.edu/projects/OAi/marcxml/container.xsd\"\n"
+                "<oai_marc xmlns=\"http://www.openarchives.org/OIA/oai_marc\""
+                "\n"
+                " xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\""
+                "\n"
+                " xsi:schemaLocation=\"http://www.openarchives.org/OAI/oai_marc.xsd\""
+                "\n"
                 );
-            wrbuf_puts(
-                wr,
-                "<oai_marc xmlns=\"http://www.openarchives.org/OIA/oai_marc\"" );
             
-            sprintf (str, "status=\"%c\" type=\"%c\" catForm=\"%c\">\n",
+            sprintf (str, " status=\"%c\" type=\"%c\" catForm=\"%c\">\n",
                      buf[5], buf[6], buf[7]);
             wrbuf_puts (wr, str);
         }
@@ -236,9 +232,9 @@ int yaz_marc_decode (const char *buf, WRBUF wr, int debug, int bsize, int xml)
 	               buf[i] != ISO2709_FS && i < end_offset)
 		{
                     if (xml && buf[i] == '<')
-                        wrbuf_puts(wr, "&lt;");
+                        wrbuf_puts(wr, "&#x003C;");
                     else if (xml && buf[i] == '&')
-                        wrbuf_puts(wr, "&amp;");
+                        wrbuf_puts(wr, "&#x0026;");
                     else
                         wrbuf_putc (wr, buf[i]);
 		    i++;
@@ -279,7 +275,12 @@ int yaz_marc_decode (const char *buf, WRBUF wr, int debug, int bsize, int xml)
         }
     }
     if (xml)
-        wrbuf_puts (wr, "</iso2709>\n");
+    {
+        if (xml > 1)
+            wrbuf_puts (wr, "</oai_marc>\n");
+        else
+            wrbuf_puts (wr, "</iso2709>\n");
+    }
     wrbuf_puts (wr, "");
     return record_length;
 }