-/* $Id: retrieve.c,v 1.64 2007-02-02 12:16:38 adam Exp $
+/* $Id: retrieve.c,v 1.70 2007-05-08 12:50:04 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
#include "index.h"
#include <yaz/diagbib1.h>
#include <direntz.h>
-
+#include <yaz/oid_db.h>
#define ZEBRA_XML_HEADER_STR "<record xmlns=\"http://www.indexdata.com/zebra/\""
int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
const char *elemsetname,
- oid_value input_format,
- oid_value *output_format,
+ const Odr_oid *input_format,
+ const Odr_oid **output_format,
char **rec_bufp, int *rec_lenp)
{
const char *retrieval_index;
int ord;
/* only accept XML and SUTRS requests */
- if (input_format != VAL_TEXT_XML && input_format != VAL_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);
- *output_format = VAL_NONE;
+ *output_format = 0;
return YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
}
zebra_term_untrans(zh, index_type, dst_buf, str);
- if (input_format == VAL_TEXT_XML)
+ if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
- *output_format = VAL_TEXT_XML;
+ *output_format = yaz_oid_recsyn_xml;
wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
" sysno=\"" ZINT_FORMAT "\""
" set=\"zebra::index%s/\">\n",
wrbuf_printf(wrbuf, "</index>\n");
wrbuf_printf(wrbuf, "</record>\n");
}
- else if (input_format == VAL_SUTRS)
+ else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
{
- *output_format = VAL_SUTRS;
+ *output_format = yaz_oid_recsyn_sutrs;
wrbuf_printf(wrbuf, "%s %c %s\n", string_index, index_type,
dst_buf);
*rec_lenp = wrbuf_len(wrbuf);
*rec_bufp = odr_malloc(odr, *rec_lenp);
memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
return 0;
}
}
int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
Record rec,
const char *elemsetname,
- oid_value input_format,
- oid_value *output_format,
+ const Odr_oid *input_format,
+ const Odr_oid **output_format,
char **rec_bufp, int *rec_lenp)
{
const char *retrieval_index;
size_t retrieval_index_len;
const char *retrieval_type;
size_t retrieval_type_len;
- WRBUF wrbuf = 0;
zebra_rec_keys_t keys;
+ int ret_code = 0;
/* set output variables before processing possible error states */
/* *rec_lenp = 0; */
/* only accept XML and SUTRS requests */
- if (input_format != VAL_TEXT_XML && input_format != VAL_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);
- *output_format = VAL_NONE;
+ *output_format = 0;
return YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
}
zebra_rec_keys_set_buf(keys, rec->info[recInfo_delKeys],
rec->size[recInfo_delKeys], 0);
- wrbuf = wrbuf_alloc();
- if (zebra_rec_keys_rewind(keys)){
+ if (!zebra_rec_keys_rewind(keys))
+ {
+ ret_code = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
+ }
+ else
+ {
size_t slen;
const char *str;
struct it_key key_in;
-
- if (input_format == VAL_TEXT_XML)
+ WRBUF wrbuf = wrbuf_alloc();
+
+ if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
- *output_format = VAL_TEXT_XML;
+ *output_format = input_format;
wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
" sysno=\"" ZINT_FORMAT "\""
" set=\"zebra::index%s/\">\n",
sysno, elemsetname);
}
- else if (input_format == VAL_SUTRS)
- *output_format = VAL_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))
{
zebra_term_untrans(zh, index_type, dst_buf, str);
if (strlen(dst_buf))
{
- if (input_format == VAL_TEXT_XML){
+ if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
+ {
wrbuf_printf(wrbuf, " <index name=\"%s\"",
string_index);
wrbuf_xmlputs(wrbuf, dst_buf);
wrbuf_printf(wrbuf, "</index>\n");
}
- else if (input_format == VAL_SUTRS){
+ else
+ {
wrbuf_printf(wrbuf, "%s ", string_index);
wrbuf_printf(wrbuf, "%c", index_type);
for (i = 1; i < key_in.len; i++)
wrbuf_printf(wrbuf, " " ZINT_FORMAT,
key_in.mem[i]);
-
- /* zebra_term_untrans(zh, index_type, dst_buf, str); */
+
+ /* zebra_term_untrans(zh, index_type, dst_buf, str); */
wrbuf_printf(wrbuf, " %s", dst_buf);
wrbuf_printf(wrbuf, "\n");
}
}
}
- if (input_format == VAL_TEXT_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);
+ memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
+ wrbuf_destroy(wrbuf);
}
- *rec_lenp = wrbuf_len(wrbuf);
- *rec_bufp = odr_malloc(odr, *rec_lenp);
- memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
- wrbuf_free(wrbuf, 1);
zebra_rec_keys_close(keys);
- return 0;
+ return ret_code;
}
}
int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
- const char *elemsetname,
- oid_value input_format,
- oid_value *output_format,
- char **rec_bufp, int *rec_lenp)
+ const char *elemsetname,
+ const Odr_oid *input_format,
+ const Odr_oid **output_format,
+ char **rec_bufp, int *rec_lenp)
{
Record rec;
{
int ret = 0;
WRBUF wrbuf = wrbuf_alloc();
- if (input_format == VAL_SUTRS)
+ if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
{
wrbuf_printf(wrbuf, ZINT_FORMAT, sysno);
- *output_format = VAL_SUTRS;
+ *output_format = input_format;
}
- else if (input_format == VAL_TEXT_XML)
+ else if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
" sysno=\"" ZINT_FORMAT "\"/>\n",
sysno);
- *output_format = VAL_TEXT_XML;
+ *output_format = input_format;
}
*rec_lenp = wrbuf_len(wrbuf);
if (*rec_lenp)
- *rec_bufp = odr_strdup(odr, wrbuf_buf(wrbuf));
+ *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf));
else
ret = YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
return ret;
}
}
/* only accept XML and SUTRS requests from now */
- if (input_format != VAL_TEXT_XML && input_format != VAL_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);
WRBUF wrbuf = wrbuf_alloc();
RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec);
- if (input_format == VAL_TEXT_XML)
+ if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
- *output_format = VAL_TEXT_XML;
+ *output_format = input_format;
wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
" sysno=\"" ZINT_FORMAT "\"", sysno);
recordAttr->recordSize,
elemsetname);
}
- else if (input_format == VAL_SUTRS)
+ else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
{
- *output_format = VAL_SUTRS;
+ *output_format = input_format;
wrbuf_printf(wrbuf, "sysno " ZINT_FORMAT "\n", sysno);
retrieve_puts_str(wrbuf, "base", rec->info[recInfo_databaseName]);
retrieve_puts_str(wrbuf, "file", rec->info[recInfo_filename]);
}
*rec_lenp = wrbuf_len(wrbuf);
if (*rec_lenp)
- *rec_bufp = odr_strdup(odr, wrbuf_buf(wrbuf));
+ *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf));
else
ret = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
rec_free(&rec);
return ret;
}
int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
zebra_snippets *hit_snippet, ODR odr,
- oid_value input_format, Z_RecordComposition *comp,
- oid_value *output_format,
+ const Odr_oid *input_format, Z_RecordComposition *comp,
+ const Odr_oid **output_format,
char **rec_bufp, int *rec_lenp, char **basenamep,
char **addinfo)
{
yaz_log(YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d",
sysno, score);
- zebra_create_record_stream(zh, &rec, &stream);
-
+ return_code = zebra_create_record_stream(zh, &rec, &stream);
+
+ if (rec)
{
- /* snippets code */
zebra_snippets *snippet;
zebra_rec_keys_t reckeys = zebra_rec_keys_open();
RecType rt;
zebra_snippets_destroy(snippet);
zebra_snippets_destroy(retrieveCtrl.doc_snippet);
- }
- stream.destroy(&stream);
- rec_free(&rec);
+ stream.destroy(&stream);
+ rec_free(&rec);
+ }
return return_code;
}
projects / idzebra-moved-to-github.git / blobdiff