From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 6 Jun 2012 12:07:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.2.34~3
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=a5af8f0be7d54de3a860346ee3909463008c5090;hp=9471482ee33ba4513858f9bcc654327af4fe1b99;p=yaz-moved-to-github.git

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

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 58afbbf..e597e24 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -1021,6 +1021,15 @@ ZOOM_API(ZOOM_facet_field)
     return 0;
 }
 
+ZOOM_API(ZOOM_facet_field)
+    ZOOM_resultset_get_facet_field_by_index(ZOOM_resultset r, int index) {
+    int num = r->num_facets;
+    ZOOM_facet_field *facets = r->facets;
+    if (index >= 0 && index < num) {
+        return facets[index];
+    }
+    return 0;
+}
 
 ZOOM_API(ZOOM_facet_field *)
     ZOOM_resultset_facets(ZOOM_resultset r)
@@ -1029,7 +1038,7 @@ ZOOM_API(ZOOM_facet_field *)
 }
 
 ZOOM_API(const char**)
-    ZOOM_resultset_facet_names(ZOOM_resultset r)
+    ZOOM_resultset_facets_names(ZOOM_resultset r)
 {
     return (const char **) r->facets_names;
 }
diff --git a/test/test_embed_record.c b/test/test_embed_record.c
index 52d591f..b3c5393 100644
--- a/test/test_embed_record.c
+++ b/test/test_embed_record.c
@@ -15,16 +15,47 @@
 #if YAZ_HAVE_XML2
 
 #include <yaz/base64.h>
+#include <yaz/marcdisp.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
 void test(void)
 {
-    char sample_rec[] = "MTIzNAo=";
-    char out_rec[10];
-    yaz_base64decode(sample_rec, out_rec);
-    YAZ_CHECK(strcmp(out_rec, "1234\n") == 0);
+  char base_enc[] = 
+    "MDA3NjZuYW0gIDIyMDAyNjU4YSA0NTAwMDAxMDAxMjAwMDAwMDAzMDAwNjAwMDEyMDA1MDAx"
+    "NzAwMDE4MDA4MDA0MTAwMDM1MDEwMDAxNzAwMDc2MDIwMDAxNTAwMDkzMDM1MDAxODAwMTA4"
+    "MDQwMDAxODAwMTI2MDQ5MDAwOTAwMTQ0MDUwMDAyNjAwMTUzMDgyMDAxNzAwMTc5MTAwMDAx"
+    "ODAwMTk2MjQ1MDA2NzAwMjE0MjYwMDA1MjAwMjgxMjYzMDAwOTAwMzMzMzAwMDAyNzAwMzQy"
+    "NTAwMDAyNzAwMzY5NTA0MDA1MTAwMzk2NjUwMDA0NDAwNDQ3OTk5MDAwOTAwNDkxHm9jbTI4"
+    "MzM5ODYzHk9Db0xDHjE5OTQwMTA1MDc0NTIyLjAeOTMwNjA5czE5OTQgICAgY291ICAgICAg"
+    "YiAgICAwMDEgMCBlbmcgIB4gIB9hICAgOTMwMDkwNDcgHiAgH2EwMTMwMzA1NTI5HiAgH2Eo"
+    "b2NtKTI4MzM5ODYzHiAgH2FETEMfY0RMQx9kS0tVHiAgH2FLS1VKHjAwH2FRQTc2LjczLkMy"
+    "OB9iRzczIDE5OTQeMDAfYTAwNS4xMy8zHzIyMB4xIB9hR3JhaGFtLCBQYXVsLh4xMB9hT24g"
+    "TGlzcCA6H2JhZHZhbmNlZCB0ZWNobmlxdWVzIGZvciBjb21tb24gTGlzcCAvH2NQYXVsIEdy"
+    "YWhhbS4eICAfYUVuZ2xld29vZCBDbGlmZnMsIE4uSi4gOh9iUHJlbnRpY2UgSGFsbCwfYzE5"
+    "OTQuHiAgH2E5NDEwHiAgH2F4aWlpLCA0MTMgcC4gOx9jMjMgY20uHiAgH2EiQW4gQWxhbiBS"
+    "LiBBcHQgYm9vay4iHiAgH2FJbmNsdWRlcyBiaWJsaW9ncmFwaGljYWwgcmVmZXJlbmNlcyBh"
+    "bmQgaW5kZXguHiAwH2FDT01NT04gTElTUCAoQ29tcHV0ZXIgcHJvZ3JhbSBsYW5ndWFnZSke"
+    "H2xVQUhJTEweHQ==";
+
+    char bin_marc[] = 
+      "00766nam  22002658a 4500001001200000003000600012005001700018008004100035010001700076020001500093035001800108040001800126049000900144050002600153082001700179100001800196245006700214260005200281263000900333300002700342500002700369504005100396650004400447999000900491\036ocm28339863\036OCoLC\03619940105074522.0\036930609s1994    cou      b    001 0 eng  \036  \037a   93009047 \036  \037a0130305529\036  \037a(ocm)28339863\036  \037aDLC\037cDLC\037dKKU\036  \037aKKUJ\03600\037aQA76.73.C28\037bG73 1994\03600\037a005.13/3\037220\0361 \037aGraham, Paul.\03610\037aOn Lisp :\037badvanced techniques for common Lisp /\037cPaul Graham.\036  \037aEnglewood Cliffs, N.J. :\037bPrentice Hall,\037c1994.\036  \037a9410\036  \037axiii, 413 p. ;\037c23 cm.\036  \037a\"An Alan R. Apt book.\"\036  \037aIncludes bibliographical references and index.\036 0\037aCOMMON LISP (Computer program language)\036\037lUAHILL\036\035";
+
+    int marc_size = strlen(bin_marc);
+    char out_rec[1000];
+    yaz_base64decode(base_enc, out_rec);
+    YAZ_CHECK(strcmp(out_rec, bin_marc) == 0);
+
+    yaz_marc_t marc = yaz_marc_create();
+    yaz_marc_read_iso2709(marc, out_rec, marc_size);
+
+    WRBUF buf = wrbuf_alloc();
+    yaz_marc_write_marcxml(marc, buf);
+
+    yaz_marc_destroy(marc);
+    wrbuf_destroy(buf);
+
 }
 #endif