X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fretrieve.c;h=6a56d618e33a328884b3d3b2f6a9fbdf696601aa;hp=d3ca5ad13531457a08fe0802bf29599f3d66e781;hb=e199777080c6fa0963d51b7df1763fd5286ca9a4;hpb=6988ba91e363565638c27a8d5895ad9afc409e75
diff --git a/index/retrieve.c b/index/retrieve.c
index d3ca5ad..6a56d61 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.71 2007-08-21 11:06:47 adam Exp $
+/* $Id: retrieve.c,v 1.75 2007-10-31 16:56:14 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, "");
@@ -444,17 +448,11 @@ static void snippet_xml_record(ZebraHandle zh, WRBUF wrbuf, zebra_snippets *doc)
wrbuf_printf(wrbuf, "");
}
-int zebra_special_snippet_fetch(ZebraHandle zh, const char *setname,
- zint sysno, ODR odr,
- const char *elemsetname,
- const Odr_oid *input_format,
- const Odr_oid **output_format,
- char **rec_bufp, int *rec_lenp)
+int zebra_get_rec_snippets(ZebraHandle zh, zint sysno,
+ zebra_snippets *snippets)
{
int return_code = 0;
- Record rec;
-
- rec = rec_get(zh->reg->records, sysno);
+ Record rec = rec_get(zh->reg->records, sysno);
if (!rec)
{
yaz_log(YLOG_WARN, "rec_get fail on sysno=" ZINT_FORMAT, sysno);
@@ -466,60 +464,73 @@ int zebra_special_snippet_fetch(ZebraHandle zh, const char *setname,
void *recTypeClientData;
RecType rt = recType_byName(zh->reg->recTypes, zh->res,
file_type, &recTypeClientData);
- zebra_snippets *hit_snippet = zebra_snippets_create();
- WRBUF wrbuf = wrbuf_alloc();
- zebra_snippets_hit_vector(zh, setname, sysno, hit_snippet);
-
if (!rt)
return_code = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
else
{
struct ZebraRecStream stream;
-
return_code = zebra_create_record_stream(zh, &rec, &stream);
if (return_code == 0)
{
- zebra_snippets *rec_snippet = zebra_snippets_create();
- extract_snippet(zh, rec_snippet, &stream,
+ extract_snippet(zh, snippets, &stream,
rt, recTypeClientData);
-#if 0
- /* for debugging purposes */
- yaz_log(YLOG_LOG, "---------------------------");
- yaz_log(YLOG_LOG, "REC SNIPPET:");
- zebra_snippets_log(rec_snippet, YLOG_LOG, 1);
- yaz_log(YLOG_LOG, "---------------------------");
- yaz_log(YLOG_LOG, "HIT SNIPPET:");
- zebra_snippets_log(hit_snippet, YLOG_LOG, 1);
-#endif
+ stream.destroy(&stream);
+ }
+ }
+ rec_free(&rec);
+ }
+ return return_code;
+}
- zebra_snippets_ring(rec_snippet, hit_snippet, 5, 5);
+int zebra_special_snippet_fetch(ZebraHandle zh, const char *setname,
+ zint sysno, ODR odr,
+ const char *elemsetname,
+ const Odr_oid *input_format,
+ const Odr_oid **output_format,
+ char **rec_bufp, int *rec_lenp)
+{
+ zebra_snippets *rec_snippets = zebra_snippets_create();
+ int return_code = zebra_get_rec_snippets(zh, sysno, rec_snippets);
-#if 0
- yaz_log(YLOG_LOG, "---------------------------");
- yaz_log(YLOG_LOG, "RING SNIPPET:");
- zebra_snippets_log(rec_snippet, YLOG_LOG, 1);
-#endif
-
- snippet_xml_record(zh, wrbuf, rec_snippet);
+ if (!return_code)
+ {
+ WRBUF wrbuf = wrbuf_alloc();
+ zebra_snippets *hit_snippet = zebra_snippets_create();
- *output_format = yaz_oid_recsyn_xml;
+ zebra_snippets_hit_vector(zh, setname, sysno, hit_snippet);
-
- zebra_snippets_destroy(rec_snippet);
- }
- stream.destroy(&stream);
- }
+#if 0
+ /* for debugging purposes */
+ yaz_log(YLOG_LOG, "---------------------------");
+ yaz_log(YLOG_LOG, "REC SNIPPET:");
+ zebra_snippets_log(rec_snippet, YLOG_LOG, 1);
+ yaz_log(YLOG_LOG, "---------------------------");
+ yaz_log(YLOG_LOG, "HIT SNIPPET:");
+ zebra_snippets_log(hit_snippet, YLOG_LOG, 1);
+#endif
+
+ zebra_snippets_ring(rec_snippets, hit_snippet, 5, 5);
+
+#if 0
+ yaz_log(YLOG_LOG, "---------------------------");
+ yaz_log(YLOG_LOG, "RING SNIPPET:");
+ zebra_snippets_log(rec_snippets, YLOG_LOG, 1);
+#endif
+ snippet_xml_record(zh, wrbuf, rec_snippets);
+
+ *output_format = yaz_oid_recsyn_xml;
+
if (return_code == 0)
{
*rec_lenp = wrbuf_len(wrbuf);
*rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf));
}
wrbuf_destroy(wrbuf);
- rec_free(&rec);
zebra_snippets_destroy(hit_snippet);
}
+ zebra_snippets_destroy(rec_snippets);
return return_code;
}
@@ -733,8 +744,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);