X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=364bd23fca2449cb1151afcef7662de85c82c26a;hb=ebf3ccba5a3bb82321066f26d1162424483b98fa;hp=8957c3cd1f05bc00c2401ac25acc9fa11940f598;hpb=5623222cf968d493c2bc9506c42b8344de60c4e5;p=idzebra-moved-to-github.git
diff --git a/index/retrieve.c b/index/retrieve.c
index 8957c3c..364bd23 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.72 2007-08-21 13:27:04 adam Exp $
+/* $Id: retrieve.c,v 1.76 2007-11-30 12:19:08 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
@@ -62,8 +62,8 @@ static int zebra_create_record_stream(ZebraHandle zh,
else
strcpy(full_rep, (*rec)->info[recInfo_filename]);
- if ((fd = open (full_rep, O_BINARY|O_RDONLY)) == -1){
- yaz_log (YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s",
+ if ((fd = open(full_rep, O_BINARY|O_RDONLY)) == -1){
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s",
full_rep);
rec_free(rec);
return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
@@ -131,6 +131,7 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
const char *retrieval_type;
size_t retrieval_type_len;
char retrieval_index_cstr[256];
+ char retrieval_type_cstr[256];
int ord;
/* only accept XML and SUTRS requests */
@@ -161,9 +162,12 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
memcpy(retrieval_index_cstr, retrieval_index, retrieval_index_len);
retrieval_index_cstr[retrieval_index_len] = '\0';
+ memcpy(retrieval_type_cstr, retrieval_type, retrieval_type_len);
+ retrieval_type_cstr[retrieval_type_len] = '\0';
+
ord = zebraExplain_lookup_attr_str(zh->reg->zei,
zinfo_index_category_sort,
- retrieval_type[0],
+ retrieval_type_cstr,
retrieval_index_cstr);
if (ord == -1)
return -1; /* is not a sort index */
@@ -171,7 +175,7 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
{
char dst_buf[IT_MAX_WORD];
char str[IT_MAX_WORD];
- int index_type;
+ const char *index_type;
const char *db = 0;
const char *string_index = 0;
WRBUF wrbuf = wrbuf_alloc();
@@ -183,7 +187,6 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db, &string_index);
zebra_term_untrans(zh, index_type, dst_buf, str);
-
if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
@@ -195,7 +198,7 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
wrbuf_printf(wrbuf, " ", index_type);
+ wrbuf_printf(wrbuf, " type=\"%s\">", index_type);
wrbuf_xmlputs(wrbuf, dst_buf);
wrbuf_printf(wrbuf, "\n");
wrbuf_printf(wrbuf, "\n");
@@ -204,7 +207,7 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
{
*output_format = yaz_oid_recsyn_sutrs;
- wrbuf_printf(wrbuf, "%s %c %s\n", string_index, index_type,
+ wrbuf_printf(wrbuf, "%s %s %s\n", string_index, index_type,
dst_buf);
}
*rec_lenp = wrbuf_len(wrbuf);
@@ -228,6 +231,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
size_t retrieval_type_len;
zebra_rec_keys_t keys;
int ret_code = 0;
+ char retrieval_type_cstr[256];
/* set output variables before processing possible error states */
/* *rec_lenp = 0; */
@@ -247,11 +251,12 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
&retrieval_type, &retrieval_type_len))
return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
- if (retrieval_type_len != 0 && retrieval_type_len != 1)
+ if (retrieval_type_len)
{
- return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
+ memcpy(retrieval_type_cstr, retrieval_type, retrieval_type_len);
+ retrieval_type_cstr[retrieval_type_len] = '\0';
}
-
+
if (retrieval_index_len)
{
char retrieval_index_cstr[256];
@@ -263,8 +268,8 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
if (zebraExplain_lookup_attr_str(zh->reg->zei,
zinfo_index_category_index,
- (retrieval_type_len == 0 ? -1 :
- retrieval_type[0]),
+ (retrieval_type_len == 0 ? 0 :
+ retrieval_type_cstr),
retrieval_index_cstr) == -1)
return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
}
@@ -300,7 +305,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
{
int i;
int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
- int index_type;
+ const char *index_type;
const char *db = 0;
const char *string_index = 0;
size_t string_index_len;
@@ -319,8 +324,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
{
/* process only if type is not defined, or is matching */
if (retrieval_type == 0
- || (retrieval_type_len == 1
- && retrieval_type[0] == index_type))
+ || !strcmp(retrieval_type_cstr, index_type))
{
zebra_term_untrans(zh, index_type, dst_buf, str);
if (strlen(dst_buf))
@@ -330,7 +334,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
wrbuf_printf(wrbuf, " ",
key_in.mem[key_in.len -1]);
@@ -342,7 +346,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
{
wrbuf_printf(wrbuf, "%s ", string_index);
- wrbuf_printf(wrbuf, "%c", index_type);
+ wrbuf_printf(wrbuf, "%s", index_type);
for (i = 1; i < key_in.len; i++)
wrbuf_printf(wrbuf, " " ZINT_FORMAT,
@@ -411,7 +415,7 @@ static void snippet_xml_record(ZebraHandle zh, WRBUF wrbuf, zebra_snippets *doc)
{
if (doc_w->mark)
{
- int index_type;
+ const char *index_type;
const char *db = 0;
const char *string_index = 0;
@@ -421,7 +425,7 @@ static void snippet_xml_record(ZebraHandle zh, WRBUF wrbuf, zebra_snippets *doc)
if (mark_state == 0)
{
wrbuf_printf(wrbuf, " ", index_type);
+ wrbuf_printf(wrbuf, " type=\"%s\">", index_type);
}
if (doc_w->match)
wrbuf_puts(wrbuf, "");
@@ -699,7 +703,7 @@ int zebra_special_fetch(ZebraHandle zh, const char *setname,
int zebra_record_fetch(ZebraHandle zh, const char *setname,
zint sysno, int score,
- zebra_snippets *hit_snippet, ODR odr,
+ ODR odr,
const Odr_oid *input_format, Z_RecordComposition *comp,
const Odr_oid **output_format,
char **rec_bufp, int *rec_lenp, char **basenamep,
@@ -712,7 +716,15 @@ int zebra_record_fetch(ZebraHandle zh, const char *setname,
RecordAttr *recordAttr;
void *clientData;
int return_code = 0;
+ zint sysnos[10];
+ int no_sysnos = 10;
+ ZEBRA_RES res;
+
+ res = zebra_result_recid_to_sysno(zh, setname, sysno, sysnos, &no_sysnos);
+ if (res != ZEBRA_OK)
+ return ZEBRA_FAIL;
+ sysno = sysnos[0];
*basenamep = 0;
*addinfo = 0;
elemsetname = yaz_get_esn(comp);
@@ -740,8 +752,8 @@ int zebra_record_fetch(ZebraHandle zh, const char *setname,
file_type = rec->info[recInfo_fileType];
fname = rec->info[recInfo_filename];
basename = rec->info[recInfo_databaseName];
- *basenamep = (char *) odr_malloc (odr, strlen(basename)+1);
- strcpy (*basenamep, basename);
+ *basenamep = (char *) odr_malloc(odr, strlen(basename)+1);
+ strcpy(*basenamep, basename);
yaz_log(YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d",
sysno, score);
@@ -750,7 +762,6 @@ int zebra_record_fetch(ZebraHandle zh, const char *setname,
if (rec)
{
- zebra_rec_keys_t reckeys = zebra_rec_keys_open();
RecType rt;
struct recRetrieveCtrl retrieveCtrl;
@@ -770,15 +781,6 @@ int zebra_record_fetch(ZebraHandle zh, const char *setname,
retrieveCtrl.res = zh->res;
retrieveCtrl.rec_buf = 0;
retrieveCtrl.rec_len = -1;
- retrieveCtrl.hit_snippet = hit_snippet;
- retrieveCtrl.doc_snippet = zebra_snippets_create();
-
- zebra_rec_keys_set_buf(reckeys,
- rec->info[recInfo_delKeys],
- rec->size[recInfo_delKeys],
- 0);
- zebra_rec_keys_to_snippets(zh, reckeys, retrieveCtrl.doc_snippet);
- zebra_rec_keys_close(reckeys);
if (!(rt = recType_byName(zh->reg->recTypes, zh->res,
file_type, &clientData)))
@@ -802,8 +804,6 @@ int zebra_record_fetch(ZebraHandle zh, const char *setname,
*addinfo = retrieveCtrl.addinfo;
}
- zebra_snippets_destroy(retrieveCtrl.doc_snippet);
-
stream.destroy(&stream);
rec_free(&rec);
}