From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 16 Apr 2007 21:54:37 +0000 (+0000)
Subject: Another and hopefully, last, YAZ OID DB update
X-Git-Tag: ZEBRA.2.0.14~15
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=1b5ef8265837240930862dddd2d7ef963a0cc211

Another and hopefully, last, YAZ OID DB update
---

diff --git a/data1/d1_doespec.c b/data1/d1_doespec.c
index c00cc90..30345d5 100644
--- a/data1/d1_doespec.c
+++ b/data1/d1_doespec.c
@@ -1,4 +1,4 @@
-/* $Id: d1_doespec.c,v 1.13 2007-04-16 08:44:31 adam Exp $
+/* $Id: d1_doespec.c,v 1.14 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -283,7 +283,7 @@ static int match_children_here (data1_handle dh, data1_node *n,
 		    Z_Variant *vreq =
 			e->elements[i]->u.simpleElement->variantRequest;
 
-                    const int *var_oid = yaz_oid_variant1();
+                    const int *var_oid = yaz_oid_varset_variant_1;
 		    if (!vreq)
 			vreq = e->defaultVariantRequest;
 
diff --git a/data1/d1_espec.c b/data1/d1_espec.c
index 4c64840..3a13b63 100644
--- a/data1/d1_espec.c
+++ b/data1/d1_espec.c
@@ -1,4 +1,4 @@
-/* $Id: d1_espec.c,v 1.14 2007-04-16 08:44:31 adam Exp $
+/* $Id: d1_espec.c,v 1.15 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -37,7 +37,7 @@ static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
     Z_Variant *r = (Z_Variant *)nmem_malloc(nmem, sizeof(*r));
     int i;
 
-    r->globalVariantSetId = odr_oiddup_nmem(nmem, yaz_oid_variant1());
+    r->globalVariantSetId = odr_oiddup_nmem(nmem, yaz_oid_varset_variant_1);
     if (argc)
 	r->triples = (Z_Triple **)nmem_malloc(nmem, sizeof(Z_Triple*) * argc);
     else
diff --git a/index/alvis.c b/index/alvis.c
index 77efef6..0822fab 100644
--- a/index/alvis.c
+++ b/index/alvis.c
@@ -1,4 +1,4 @@
-/* $Id: alvis.c,v 1.16 2007-04-16 08:44:31 adam Exp $
+/* $Id: alvis.c,v 1.17 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -730,7 +730,8 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
     {
 	p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
     }
-    else if (!p->input_format || !oid_oidcmp(p->input_format, yaz_oid_xml()))
+    else if (!p->input_format 
+             || !oid_oidcmp(p->input_format, yaz_oid_recsyn_xml))
     {
 	xmlChar *buf_out;
 	int len_out;
@@ -741,13 +742,13 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
         else
 	    xmlDocDumpMemory(resDoc, &buf_out, &len_out);            
 
-	p->output_format = yaz_oid_xml();
+	p->output_format = yaz_oid_recsyn_xml;
 	p->rec_len = len_out;
 	p->rec_buf = odr_malloc(p->odr, p->rec_len);
 	memcpy(p->rec_buf, buf_out, p->rec_len);
 	xmlFree(buf_out);
     }
-    else if (!oid_oidcmp(p->output_format, yaz_oid_sutrs()))
+    else if (!oid_oidcmp(p->output_format, yaz_oid_recsyn_sutrs))
     {
 	xmlChar *buf_out;
 	int len_out;
@@ -758,7 +759,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
         else
 	    xmlDocDumpMemory(resDoc, &buf_out, &len_out);            
 
-	p->output_format = yaz_oid_sutrs();
+	p->output_format = yaz_oid_recsyn_sutrs;
 	p->rec_len = len_out;
 	p->rec_buf = odr_malloc(p->odr, p->rec_len);
 	memcpy(p->rec_buf, buf_out, p->rec_len);
diff --git a/index/attribute.c b/index/attribute.c
index 4fb5bb2..e37e3a0 100644
--- a/index/attribute.c
+++ b/index/attribute.c
@@ -1,4 +1,4 @@
-/* $Id: attribute.c,v 1.29 2007-04-16 08:44:31 adam Exp $
+/* $Id: attribute.c,v 1.30 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -193,7 +193,7 @@ ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh,
     if (zebra_attr_list_get_ord(
             zh, sortAttributes->list,
             zinfo_index_category_sort,
-            -1 /* any index */, yaz_oid_attset_bib1(), ord) == ZEBRA_OK)
+            -1 /* any index */, yaz_oid_attset_bib_1, ord) == ZEBRA_OK)
         return ZEBRA_OK;
     return ZEBRA_FAIL;
 }
diff --git a/index/mod_dom.c b/index/mod_dom.c
index ea09c31..0670ab4 100644
--- a/index/mod_dom.c
+++ b/index/mod_dom.c
@@ -1,4 +1,4 @@
-/* $Id: mod_dom.c,v 1.35 2007-04-16 08:44:31 adam Exp $
+/* $Id: mod_dom.c,v 1.36 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -1388,7 +1388,8 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
     {
         p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
     }
-    else if (!p->input_format || !oid_oidcmp(p->input_format, yaz_oid_xml()))
+    else if (!p->input_format
+             || !oid_oidcmp(p->input_format, yaz_oid_recsyn_xml))
     {
         xmlChar *buf_out;
         int len_out;
@@ -1398,13 +1399,13 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
         else
             xmlDocDumpMemory(doc, &buf_out, &len_out);            
 
-        p->output_format = yaz_oid_xml();
+        p->output_format = yaz_oid_recsyn_xml;
         p->rec_len = len_out;
         p->rec_buf = odr_malloc(p->odr, p->rec_len);
         memcpy(p->rec_buf, buf_out, p->rec_len);
         xmlFree(buf_out);
     }
-    else if (!oid_oidcmp(p->output_format, yaz_oid_sutrs()))
+    else if (!oid_oidcmp(p->output_format, yaz_oid_recsyn_sutrs))
     {
         xmlChar *buf_out;
         int len_out;
@@ -1414,7 +1415,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
         else
             xmlDocDumpMemory(doc, &buf_out, &len_out);            
         
-        p->output_format = yaz_oid_sutrs();
+        p->output_format = yaz_oid_recsyn_sutrs;
         p->rec_len = len_out;
         p->rec_buf = odr_malloc(p->odr, p->rec_len);
         memcpy(p->rec_buf, buf_out, p->rec_len);
diff --git a/index/recgrs.c b/index/recgrs.c
index 862a4f3..cb99ff3 100644
--- a/index/recgrs.c
+++ b/index/recgrs.c
@@ -1,4 +1,4 @@
-/* $Id: recgrs.c,v 1.17 2007-04-16 08:44:32 adam Exp $
+/* $Id: recgrs.c,v 1.18 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -1078,8 +1078,6 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
     NMEM mem;
     struct grs_read_info gri;
     const char *tagname;
-    const int *xml_oid = yaz_oid_xml();
-    const int *grs1_oid = yaz_oid_grs1();
 
     const int *requested_schema = 0;
     data1_marctab *marctab;
@@ -1145,11 +1143,11 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 
     if (!p->input_format)
     {  /* SUTRS is default input_format */
-        p->input_format = yaz_oid_sutrs();
+        p->input_format = yaz_oid_recsyn_sutrs;
     }
     assert(p->input_format);
 
-    if (!oid_oidcmp(p->input_format, xml_oid))
+    if (!oid_oidcmp(p->input_format, yaz_oid_recsyn_xml))
         zebra_xml_metadata (p, top, mem);
 
 #if 0
@@ -1214,7 +1212,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
         }
     yaz_log(YLOG_DEBUG, "grs_retrieve: schemaIdentifier");
     if (node->u.root.absyn && node->u.root.absyn->oid 
-        && !oid_oidcmp(p->input_format, grs1_oid))
+        && !oid_oidcmp(p->input_format, yaz_oid_recsyn_grs_1))
     {
         char oid_str[OID_STR_MAX];
         char *dot_str = oid_oid_to_dotstring(node->u.root.absyn->oid, oid_str);
@@ -1247,7 +1245,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
     p->output_format = p->input_format;
 
     assert(p->input_format);
-    if (!oid_oidcmp(p->input_format, yaz_oid_xml()))
+    if (!oid_oidcmp(p->input_format, yaz_oid_recsyn_xml))
     {
 #if 0
         data1_pr_tree (p->dh, node, stdout);
@@ -1267,7 +1265,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 	    p->rec_buf = new_buf;
 	}
     }
-    else if (!oid_oidcmp(p->input_format, yaz_oid_grs1()))
+    else if (!oid_oidcmp(p->input_format, yaz_oid_recsyn_grs_1))
     {
 	data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
 	dummy = 0;
@@ -1277,7 +1275,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 	else
 	    p->rec_len = -1;
     }
-    else if (!oid_oidcmp(p->input_format, yaz_oid_explain()))
+    else if (!oid_oidcmp(p->input_format, yaz_oid_recsyn_explain))
     {
 	/* ensure our data1 tree is UTF-8 */
 	data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
@@ -1288,7 +1286,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 	else
 	    p->rec_len = -1;
     }
-    else if (!oid_oidcmp(p->input_format, yaz_oid_summary()))
+    else if (!oid_oidcmp(p->input_format, yaz_oid_recsyn_summary))
     {
 	/* ensure our data1 tree is UTF-8 */
 	data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
@@ -1298,7 +1296,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 	else
 	    p->rec_len = -1;
     }
-    else if (!oid_oidcmp(p->input_format, yaz_oid_sutrs()))
+    else if (!oid_oidcmp(p->input_format, yaz_oid_recsyn_sutrs))
     {
 	if (p->encoding)
             data1_iconv (p->dh, mem, node, p->encoding,
@@ -1313,7 +1311,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
 	    p->rec_buf = new_buf;
 	}
     }
-    else if (!oid_oidcmp(p->input_format, yaz_oid_soif()))
+    else if (!oid_oidcmp(p->input_format, yaz_oid_recsyn_soif))
     {
 	if (p->encoding)
             data1_iconv (p->dh, mem, node, p->encoding,
diff --git a/index/rectext.c b/index/rectext.c
index 39a806e..6f3968d 100644
--- a/index/rectext.c
+++ b/index/rectext.c
@@ -1,4 +1,4 @@
-/* $Id: rectext.c,v 1.5 2007-04-16 08:44:32 adam Exp $
+/* $Id: rectext.c,v 1.6 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -230,7 +230,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
             filter_ptr = p-filter_buf;
         }
     }
-    p->output_format = yaz_oid_sutrs();
+    p->output_format = yaz_oid_recsyn_sutrs;
     p->rec_buf = filter_buf;
     p->rec_len = filter_ptr; 
     return 0;
diff --git a/index/retrieve.c b/index/retrieve.c
index 1d4f4ab..bcb1556 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.68 2007-04-16 08:44:32 adam Exp $
+/* $Id: retrieve.c,v 1.69 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -133,8 +133,8 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
     int ord;
 
     /* only accept XML and SUTRS requests */
-    if (oid_oidcmp(input_format, yaz_oid_xml()) 
-        && oid_oidcmp(input_format, yaz_oid_sutrs()))
+    if (oid_oidcmp(input_format, yaz_oid_recsyn_xml) 
+        && oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
     {
         yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s", 
                 elemsetname);
@@ -184,9 +184,9 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
         zebra_term_untrans(zh, index_type, dst_buf, str);
         
 
-        if (!oid_oidcmp(input_format, yaz_oid_xml()))
+        if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
         {
-            *output_format = yaz_oid_xml();
+            *output_format = yaz_oid_recsyn_xml;
             wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
                          " sysno=\"" ZINT_FORMAT "\""
                          " set=\"zebra::index%s/\">\n",
@@ -199,9 +199,9 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
             wrbuf_printf(wrbuf, "</index>\n");
             wrbuf_printf(wrbuf, "</record>\n");
         }
-        else if (!oid_oidcmp(input_format, yaz_oid_sutrs()))
+        else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
         {
-            *output_format = yaz_oid_sutrs();
+            *output_format = yaz_oid_recsyn_sutrs;
             
             wrbuf_printf(wrbuf, "%s %c %s\n", string_index, index_type,
                          dst_buf);
@@ -232,8 +232,8 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
     /* *rec_lenp = 0; */
 
     /* only accept XML and SUTRS requests */
-    if (oid_oidcmp(input_format, yaz_oid_xml())
-        && oid_oidcmp(input_format, yaz_oid_sutrs()))
+    if (oid_oidcmp(input_format, yaz_oid_recsyn_xml)
+        && oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
     {
         yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s", 
                 elemsetname);
@@ -284,7 +284,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
         struct it_key key_in;
         WRBUF wrbuf = wrbuf_alloc();
     
-        if (!oid_oidcmp(input_format, yaz_oid_xml()))
+        if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
         {
             *output_format = input_format;
             wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
@@ -292,7 +292,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
                          " set=\"zebra::index%s/\">\n",
                          sysno, elemsetname);
         }
-        else if (!oid_oidcmp(input_format, yaz_oid_sutrs()))
+        else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
             *output_format = input_format;
 
         while (zebra_rec_keys_read(keys, &str, &slen, &key_in))
@@ -324,7 +324,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
                     zebra_term_untrans(zh, index_type, dst_buf, str);
                     if (strlen(dst_buf))
                     {
-                        if (!oid_oidcmp(input_format, yaz_oid_xml()))
+                        if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
                         {
                             wrbuf_printf(wrbuf, "  <index name=\"%s\"", 
                                          string_index);
@@ -357,7 +357,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
                 }
             }
         }
-        if (!oid_oidcmp(input_format, yaz_oid_xml()))
+        if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
             wrbuf_printf(wrbuf, "</record>\n");
         *rec_lenp = wrbuf_len(wrbuf);
         *rec_bufp = odr_malloc(odr, *rec_lenp);
@@ -417,12 +417,12 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
     {
         int ret = 0;
         WRBUF wrbuf = wrbuf_alloc();
-        if (!oid_oidcmp(input_format, yaz_oid_sutrs()))
+        if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
         {
             wrbuf_printf(wrbuf, ZINT_FORMAT, sysno);
             *output_format = input_format;
         } 
-        else if (!oid_oidcmp(input_format, yaz_oid_xml()))
+        else if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
         {
             wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
                          " sysno=\"" ZINT_FORMAT "\"/>\n",
@@ -475,8 +475,8 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
     }
 
     /* only accept XML and SUTRS requests from now */
-    if (oid_oidcmp(input_format, yaz_oid_xml())
-        && oid_oidcmp(input_format, yaz_oid_sutrs()))
+    if (oid_oidcmp(input_format, yaz_oid_recsyn_xml)
+        && oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
     {
         yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s", 
                 elemsetname);
@@ -491,7 +491,7 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
         WRBUF wrbuf = wrbuf_alloc();
         RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec); 
 
-        if (!oid_oidcmp(input_format, yaz_oid_xml()))
+        if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
         {
             *output_format = input_format;
             
@@ -511,7 +511,7 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
                          recordAttr->recordSize,
                          elemsetname);
         }
-        else if (!oid_oidcmp(input_format, yaz_oid_sutrs()))
+        else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
         {
             *output_format = input_format;
             wrbuf_printf(wrbuf, "sysno " ZINT_FORMAT "\n", sysno);
diff --git a/index/rpnscan.c b/index/rpnscan.c
index be4e765..fe0be94 100644
--- a/index/rpnscan.c
+++ b/index/rpnscan.c
@@ -1,4 +1,4 @@
-/* $Id: rpnscan.c,v 1.7 2007-04-16 08:44:32 adam Exp $
+/* $Id: rpnscan.c,v 1.8 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -398,7 +398,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     *is_partial = 0;
 
     if (!attributeset)
-        attributeset = yaz_oid_attset_bib1();
+        attributeset = yaz_oid_attset_bib_1;
 
     if (!limit_set) /* no limit set given already */
     {
diff --git a/index/safari.c b/index/safari.c
index 41cad30..4210a92 100644
--- a/index/safari.c
+++ b/index/safari.c
@@ -1,4 +1,4 @@
-/* $Id: safari.c,v 1.6 2007-04-16 08:44:32 adam Exp $
+/* $Id: safari.c,v 1.7 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -262,7 +262,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
             filter_ptr = p-filter_buf;
         }
     }
-    p->output_format = yaz_oid_sutrs();
+    p->output_format = yaz_oid_recsyn_sutrs;
     p->rec_buf = filter_buf;
     p->rec_len = filter_ptr; 
     return 0;
diff --git a/index/zebraapi.c b/index/zebraapi.c
index 825ccad..ed5fd81 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.253 2007-04-16 08:44:32 adam Exp $
+/* $Id: zebraapi.c,v 1.254 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -1120,7 +1120,7 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 	    if (poset[i].term)
 	    {
 		recs[i].errCode = 0;
-		recs[i].format = yaz_oid_sutrs();
+		recs[i].format = yaz_oid_recsyn_sutrs;
 		recs[i].len = strlen(poset[i].term);
 		recs[i].buf = poset[i].term;
 		recs[i].base = poset[i].db;
@@ -1199,7 +1199,7 @@ ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query,
     }
     else
     {
-	res = zebra_scan(zh, stream, zapt, yaz_oid_attset_bib1(),
+	res = zebra_scan(zh, stream, zapt, yaz_oid_attset_bib_1,
 			 position, num_entries, entries, is_partial,
 			 setname);
     }
diff --git a/index/zebrash.c b/index/zebrash.c
index f726883..a4bc18c 100644
--- a/index/zebrash.c
+++ b/index/zebrash.c
@@ -1,4 +1,4 @@
-/* $Id: zebrash.c,v 1.45 2007-04-16 08:44:32 adam Exp $
+/* $Id: zebrash.c,v 1.46 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -449,8 +449,8 @@ static int cmd_show( char *args[], WRBUF outbuff)
     for (i=0;i<nrecs;i++)
         recs[i].position=start+i;
 
-    rc = zebra_records_retrieve (zh, odr, setname,
-				 pcomp, yaz_oid_xml(), nrecs,recs);
+    rc = zebra_records_retrieve(zh, odr, setname,
+				pcomp, yaz_oid_recsyn_xml, nrecs,recs);
     if (0==rc)
     {
         for (i=0;i<nrecs;i++)
diff --git a/index/zebrasrv.c b/index/zebrasrv.c
index dbb44ad..47f2e01 100644
--- a/index/zebrasrv.c
+++ b/index/zebrasrv.c
@@ -1,4 +1,4 @@
-/* $Id: zebrasrv.c,v 1.13 2007-04-16 08:44:32 adam Exp $
+/* $Id: zebrasrv.c,v 1.14 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -197,7 +197,8 @@ static void search_terms(ZebraHandle zh, bend_search_rr *r)
     r->search_info->list[0]->which = Z_OtherInfo_externallyDefinedInfo;
     ext = odr_malloc (r->stream, sizeof(*ext));
     r->search_info->list[0]->information.externallyDefinedInfo = ext;
-    ext->direct_reference = odr_oiddup(r->stream, yaz_oid_search_result_1());
+    ext->direct_reference = odr_oiddup(r->stream,
+                                       yaz_oid_userinfo_searchresult_1);
     ext->indirect_reference = 0;
     ext->descriptor = 0;
     ext->which = Z_External_searchResult1;
diff --git a/test/api/t16.c b/test/api/t16.c
index 20930d5..07da77c 100644
--- a/test/api/t16.c
+++ b/test/api/t16.c
@@ -1,4 +1,4 @@
-/* $Id: t16.c,v 1.10 2007-04-16 08:44:32 adam Exp $
+/* $Id: t16.c,v 1.11 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -105,33 +105,35 @@ static void tst(int argc, char **argv)
     YAZ_CHECK_EQ(res, ZEBRA_OK);
     YAZ_CHECK_EQ(hits, 1);
     
-    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::data", yaz_oid_xml(),
+    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::data", yaz_oid_recsyn_xml,
                                      "mismatch"), ZEBRA_FAIL);
 
-    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::data", yaz_oid_sutrs(),
+    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::data", yaz_oid_recsyn_sutrs,
                                      myrec[0]), ZEBRA_OK);
 
-    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::data", yaz_oid_xml(),
+    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::data", yaz_oid_recsyn_xml,
                                      myrec[0]), ZEBRA_OK);
-
-    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::meta::sysno", yaz_oid_sutrs(),
+    
+    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::meta::sysno", 
+                                     yaz_oid_recsyn_sutrs,
                                      "2"), ZEBRA_OK);
 
-    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::meta::sysno", yaz_oid_xml(),
+    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::meta::sysno", 
+                                     yaz_oid_recsyn_xml,
                                      zebra_xml_sysno), ZEBRA_OK);
     
-    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::meta", yaz_oid_xml(),
+    YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::meta", yaz_oid_recsyn_xml,
                                      zebra_xml_meta), ZEBRA_OK);
     
     YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::index::title:p", 
-                                     yaz_oid_xml(),
+                                     yaz_oid_recsyn_xml,
                                      zebra_xml_index_title_p), ZEBRA_OK);
     
     YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::nonexistent", 
-                                     yaz_oid_xml(), ""), ZEBRA_OK);
+                                     yaz_oid_recsyn_xml, ""), ZEBRA_OK);
     
     YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::index::nonexistent", 
-                                     yaz_oid_xml(), ""), ZEBRA_OK);
+                                     yaz_oid_recsyn_xml, ""), ZEBRA_OK);
     
     YAZ_CHECK(tl_close_down(zh, zs));
 }
diff --git a/test/api/t4.c b/test/api/t4.c
index 50657ba..23eb121 100644
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,4 +1,4 @@
-/* $Id: t4.c,v 1.23 2007-04-16 08:44:32 adam Exp $
+/* $Id: t4.c,v 1.24 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -96,7 +96,7 @@ static void tst(int argc, char **argv)
 	    retrievalRecord[j].position = j+1;
 
         ret = zebra_records_retrieve(zh, odr_output, setname, 0,
-				     yaz_oid_xml(), number_to_fetch,
+				     yaz_oid_recsyn_xml, number_to_fetch,
 				     retrievalRecord);
 	if (ret != ZEBRA_OK)
 	{
diff --git a/test/api/testlib.c b/test/api/testlib.c
index 52c7ca7..0b00b09 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.43 2007-04-16 08:44:32 adam Exp $
+/* $Id: testlib.c,v 1.44 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -324,7 +324,7 @@ int tl_ranking_query(ZebraHandle zh, char *query,
 
     odr_output = odr_createmem(ODR_ENCODE);    
     rc = zebra_records_retrieve(zh, odr_output, setname, 0,
-                                yaz_oid_xml(), exphits, retrievalRecord);
+                                yaz_oid_recsyn_xml, exphits, retrievalRecord);
     if (rc != ZEBRA_OK)
         ret = 0;
     else if (!strstr(retrievalRecord[0].buf, firstrec))