Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yaz

[yaz-moved-to-github.git] / ztest / read-marc.c

diff --git a/ztest/read-marc.c b/ztest/read-marc.c
index bf60296..fdcc174 100644 (file)
--- a/ztest/read-marc.c
+++ b/ztest/read-marc.c
@@ -1536,34 +1536,76 @@ char *marc_records[NO_MARC_RECORDS] = {
   "\x44\x42\x46\x38\x38\x34\x32\x1E\x1D"
 };
 
+static char *marc_record0 =
+  "00366nam  220016"
+  "98a 450000100130"
+  "0000003000400013"
+  "0050017000170080"
+  "0410003401000170"
+  "0179040001300075"
+  "0500012000881000"
+  "0170010024500300"
+  "0117260001200147"
+  "2630009001593000"
+  "01100168" "\x1E" "   1122"
+  "4466 " "\x1E" "DLC" "\x1E" "000000"
+  "00000000.0" "\x1E" "91071"
+  "0c19910701nju   "
+  "        00010 en"
+  "g  " "\x1E" "  " "\x1F" "aDLC" "\x1F" "cDLC"
+  "" "\x1E" "00" "\x1F" "a123-xyz" "\x1E" "10" "\x1F" ""
+  "aJack Collins" "\x1E" "10"
+  "" "\x1F" "aHow to program"
+  " a computer" "\x1E" "1 " "\x1F" "a"
+  "Penguin" "\x1E" "  " "\x1F" "a8710"
+  "" "\x1E" "  " "\x1F" "ap. cm." "\x1E" "  " "\x1F" "a"
+  "   11224466 " "\x1E" "" "\x1D" ""
+;
+
 /* read MARC record from offset 'num' */
 char *dummy_marc_record(int num, ODR odr)
 {
     if (num < 1)
         return 0;
-    return marc_records[(num-1) % NO_MARC_RECORDS];
+    if (num >= NO_MARC_RECORDS)
+    {
+        char *p = odr_strdup(odr, marc_record0);
+        sprintf(p + 279, "%-5d", num);
+        p[284] = ' ';
+        return p;
+    }
+    else
+    {
+        return marc_records[(num-1) % NO_MARC_RECORDS];
+    }
 }
 
 /* read MARC record and convert to XML */
-char *dummy_xml_record(int num, ODR odr)
+char *dummy_xml_record(int num, ODR odr, const char *esn)
 {
     char *rec = dummy_marc_record(num, odr);
 
     if (rec)
     {
-        const char *result;
-        size_t rlen;
-        int len;
+        WRBUF w = wrbuf_alloc();
         yaz_marc_t mt = yaz_marc_create();
+
         yaz_marc_xml(mt, YAZ_MARC_MARCXML);
-        len = yaz_marc_decode_buf(mt, rec, -1, &result, &rlen);
-        if (len > 1)
+        if (esn && !strcmp(esn, "OP"))
+        {
+            /* generate OPACXML (OPAC in XML) */
+            Z_OPACRecord *opac = dummy_opac(num, odr, rec);
+            yaz_opac_decode_wrbuf(mt, opac, w);
+        }
+        else
         {
-            rec = (char *) odr_malloc(odr, rlen+1);
-            memcpy(rec, result, rlen);
-            rec[rlen] = '\0';
+            /* generate MARCXML */
+            yaz_marc_decode_wrbuf(mt, rec, -1, w);
         }
+        rec = odr_strdup(odr, wrbuf_cstr(w));
         yaz_marc_destroy(mt);
+        wrbuf_destroy(w);
+
     }
     return rec;
 }