-/* $Id: t16.c,v 1.6 2006-11-23 09:03:51 marc Exp $
- Copyright (C) 1995-2006
+/* $Id: t16.c,v 1.12 2007-05-08 12:50:05 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
#define NUMBER_TO_FETCH_MAX 1000
static ZEBRA_RES fetch_first(ZebraHandle zh, const char *element_set,
- oid_value format, ODR odr,
+ const Odr_oid * format, ODR odr,
const char **rec_buf, size_t *rec_len)
{
ZebraRetrievalRecord retrievalRecord[1];
}
static ZEBRA_RES fetch_first_compare(ZebraHandle zh, const char *element_set,
- oid_value format, const char *cmp_rec)
+ const Odr_oid *format, const char *cmp_rec)
{
const char *rec_buf = 0;
size_t rec_len = 0;
zint hits;
ZEBRA_RES res;
const char * zebra_xml_sysno
- = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\" set=\"zebra::meta::sysno\"/>\n";
+ = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\"/>\n";
+
+ const char * zebra_xml_meta
+ = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\" base=\"Default\" type=\"grs.sgml\" rank=\"0\" size=\"41\" set=\"zebra::meta\"/>\n";
const char * zebra_xml_index_title_p
= "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\" set=\"zebra::index::title:p/\">\n"
YAZ_CHECK_EQ(res, ZEBRA_OK);
YAZ_CHECK_EQ(hits, 1);
- YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::data", VAL_TEXT_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", VAL_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", VAL_TEXT_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", VAL_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", VAL_TEXT_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", VAL_TEXT_XML,
- "definitely not this"), ZEBRA_FAIL);
+ 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",
- VAL_TEXT_XML,
+ yaz_oid_recsyn_xml,
zebra_xml_index_title_p), ZEBRA_OK);
YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::nonexistent",
- VAL_TEXT_XML, ""), ZEBRA_OK);
+ yaz_oid_recsyn_xml, ""), ZEBRA_OK);
YAZ_CHECK_EQ(fetch_first_compare(zh, "zebra::index::nonexistent",
- VAL_TEXT_XML, ""), ZEBRA_OK);
+ yaz_oid_recsyn_xml, ""), ZEBRA_OK);
YAZ_CHECK(tl_close_down(zh, zs));
}