X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=26279985967edf10f2a6e1fb9bb9f148df25b25f;hb=4e67b823f05b521f193af096a40c0f64758c5fc1;hp=c37808b04ae14f21ddef4106382fb0459df324e4;hpb=0b9734fe70bbb721a5c0464dc122c77b98299c30;p=idzebra-moved-to-github.git
diff --git a/index/retrieve.c b/index/retrieve.c
index c37808b..2627998 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,5 +1,5 @@
-/* $Id: retrieve.c,v 1.58 2006-11-24 11:35:23 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: retrieve.c,v 1.67 2007-03-19 21:50:39 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
@@ -41,8 +41,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
static int zebra_create_record_stream(ZebraHandle zh,
Record *rec,
- struct ZebraRecStream *stream){
-
+ struct ZebraRecStream *stream)
+{
RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, *rec);
if ((*rec)->size[recInfo_storeData] > 0)
@@ -65,7 +65,7 @@ static int zebra_create_record_stream(ZebraHandle zh,
yaz_log (YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s",
full_rep);
rec_free(rec);
- return 14;
+ return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
}
zebra_create_stream_fd(stream, fd, recordAttr->recordOffset);
}
@@ -75,8 +75,8 @@ static int zebra_create_record_stream(ZebraHandle zh,
static int parse_zebra_elem(const char *elem,
- const char **index, size_t *index_len,
- const char **type, size_t *type_len)
+ const char **index, size_t *index_len,
+ const char **type, size_t *type_len)
{
*index = 0;
*index_len = 0;
@@ -119,6 +119,100 @@ static int parse_zebra_elem(const char *elem,
}
+int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
+ const char *elemsetname,
+ oid_value input_format,
+ oid_value *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;
+ char retrieval_index_cstr[256];
+ int ord;
+
+ /* only accept XML and SUTRS requests */
+ if (input_format != VAL_TEXT_XML && input_format != VAL_SUTRS)
+ {
+ yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s",
+ elemsetname);
+ *output_format = VAL_NONE;
+ return YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
+ }
+
+ if (!parse_zebra_elem(elemsetname,
+ &retrieval_index, &retrieval_index_len,
+ &retrieval_type, &retrieval_type_len))
+ {
+ return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
+ }
+
+ if (retrieval_type_len == 0)
+ return -1; /* must have a register type specified */
+ if (!retrieval_index_len ||
+ retrieval_index_len >= sizeof(retrieval_index_cstr)-1)
+ {
+ return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
+ }
+
+ memcpy(retrieval_index_cstr, retrieval_index, retrieval_index_len);
+ retrieval_index_cstr[retrieval_index_len] = '\0';
+
+ ord = zebraExplain_lookup_attr_str(zh->reg->zei,
+ zinfo_index_category_sort,
+ retrieval_type[0],
+ retrieval_index_cstr);
+ if (ord == -1)
+ return -1; /* is not a sort index */
+ else
+ {
+ char dst_buf[IT_MAX_WORD];
+ char str[IT_MAX_WORD];
+ int index_type;
+ const char *db = 0;
+ const char *string_index = 0;
+ WRBUF wrbuf = wrbuf_alloc();
+
+ zebra_sort_sysno(zh->reg->sort_index, sysno);
+ zebra_sort_type(zh->reg->sort_index, ord);
+ zebra_sort_read(zh->reg->sort_index, str);
+
+ zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db, &string_index);
+
+ zebra_term_untrans(zh, index_type, dst_buf, str);
+
+
+ if (input_format == VAL_TEXT_XML)
+ {
+ *output_format = VAL_TEXT_XML;
+ wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
+ " sysno=\"" ZINT_FORMAT "\""
+ " set=\"zebra::index%s/\">\n",
+ sysno, elemsetname);
+
+ wrbuf_printf(wrbuf, " ", index_type);
+ wrbuf_xmlputs(wrbuf, dst_buf);
+ wrbuf_printf(wrbuf, "\n");
+ wrbuf_printf(wrbuf, "\n");
+ }
+ else if (input_format == VAL_SUTRS)
+ {
+ *output_format = VAL_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_destroy(wrbuf);
+ return 0;
+ }
+}
+
int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
Record rec,
const char *elemsetname,
@@ -130,15 +224,15 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
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 (input_format != VAL_TEXT_XML && input_format != VAL_SUTRS)
+ {
yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s",
elemsetname);
*output_format = VAL_NONE;
@@ -159,7 +253,7 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
{
char retrieval_index_cstr[256];
- if (retrieval_index_len < sizeof(retrieval_index_cstr) -1)
+ if (retrieval_index_len < sizeof(retrieval_index_cstr) -1)
{
memcpy(retrieval_index_cstr, retrieval_index, retrieval_index_len);
retrieval_index_cstr[retrieval_index_len] = '\0';
@@ -177,12 +271,18 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
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;
-
+ WRBUF wrbuf = wrbuf_alloc();
+
if (input_format == VAL_TEXT_XML)
{
*output_format = VAL_TEXT_XML;
@@ -194,7 +294,8 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
else if (input_format == VAL_SUTRS)
*output_format = VAL_SUTRS;
- while(zebra_rec_keys_read(keys, &str, &slen, &key_in)){
+ while (zebra_rec_keys_read(keys, &str, &slen, &key_in))
+ {
int i;
int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
int index_type;
@@ -212,17 +313,16 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
if (retrieval_index == 0
|| (string_index_len == retrieval_index_len
&& !memcmp(string_index, retrieval_index,
- string_index_len))){
-
+ string_index_len)))
+ {
/* process only if type is not defined, or is matching */
if (retrieval_type == 0
|| (retrieval_type_len == 1
- && retrieval_type[0] == index_type)){
-
-
+ && retrieval_type[0] == index_type))
+ {
zebra_term_untrans(zh, index_type, dst_buf, str);
- if (strlen(dst_buf)){
-
+ if (strlen(dst_buf))
+ {
if (input_format == VAL_TEXT_XML){
wrbuf_printf(wrbuf, " \n");
- }
- *rec_lenp = wrbuf_len(wrbuf);
- *rec_bufp = odr_malloc(odr, *rec_lenp);
- memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
- wrbuf_free(wrbuf, 1);
+ *rec_lenp = wrbuf_len(wrbuf);
+ *rec_bufp = odr_malloc(odr, *rec_lenp);
+ memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
+ wrbuf_destroy(wrbuf);
+ }
zebra_rec_keys_close(keys);
- return 0;
+ return ret_code;
}
@@ -271,12 +371,18 @@ static void retrieve_puts_attr(WRBUF wrbuf, const char *name,
{
if (value)
{
- wrbuf_printf(wrbuf, "%s=\"", name);
+ wrbuf_printf(wrbuf, " %s=\"", name);
wrbuf_xmlputs(wrbuf, value);
- wrbuf_printf(wrbuf, "\"\n");
+ wrbuf_printf(wrbuf, "\"");
}
}
+static void retrieve_puts_attr_int(WRBUF wrbuf, const char *name,
+ const int value)
+{
+ wrbuf_printf(wrbuf, " %s=\"%i\"", name, value);
+}
+
static void retrieve_puts_str(WRBUF wrbuf, const char *name,
const char *value)
{
@@ -284,6 +390,12 @@ static void retrieve_puts_str(WRBUF wrbuf, const char *name,
wrbuf_printf(wrbuf, "%s %s\n", name, value);
}
+static void retrieve_puts_int(WRBUF wrbuf, const char *name,
+ const int value)
+{
+ wrbuf_printf(wrbuf, "%s %i\n", name, value);
+}
+
int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
const char *elemsetname,
oid_value input_format,
@@ -310,20 +422,32 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
else if (input_format == VAL_TEXT_XML)
{
wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
- " sysno=\"" ZINT_FORMAT "\""
- " set=\"zebra::%s\"/>\n",
- sysno, elemsetname);
+ " sysno=\"" ZINT_FORMAT "\"/>\n",
+ sysno);
*output_format = VAL_TEXT_XML;
}
*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;
}
+ /* processing special elementsetname zebra::index:: for sort elements */
+ if (elemsetname && 0 == strncmp(elemsetname, "index", 5))
+ {
+ int ret = zebra_special_sort_fetch(zh, sysno, odr,
+ elemsetname + 5,
+ input_format, output_format,
+ rec_bufp, rec_lenp);
+ if (ret != -1)
+ return ret;
+ /* not a sort index so we continue to get the full record */
+ }
+
+
/* fetching binary record up for all other display elementsets */
rec = rec_get(zh->reg->records, sysno);
if (!rec)
@@ -367,23 +491,21 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
{
*output_format = VAL_TEXT_XML;
- wrbuf_printf(
- wrbuf, ZEBRA_XML_HEADER_STR
- " sysno=\"" ZINT_FORMAT "\"", sysno);
+ wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
+ " sysno=\"" ZINT_FORMAT "\"", sysno);
retrieve_puts_attr(wrbuf, "base", rec->info[recInfo_databaseName]);
retrieve_puts_attr(wrbuf, "file", rec->info[recInfo_filename]);
retrieve_puts_attr(wrbuf, "type", rec->info[recInfo_fileType]);
-
- wrbuf_printf(
- wrbuf,
- " score=\"%i\""
- " rank=\"" ZINT_FORMAT "\""
- " size=\"%i\""
- " set=\"zebra::%s\"/>\n",
- score,
- recordAttr->staticrank,
- recordAttr->recordSize,
- elemsetname);
+ if (score >= 0)
+ retrieve_puts_attr_int(wrbuf, "score", score);
+
+ wrbuf_printf(wrbuf,
+ " rank=\"" ZINT_FORMAT "\""
+ " size=\"%i\""
+ " set=\"zebra::%s\"/>\n",
+ recordAttr->staticrank,
+ recordAttr->recordSize,
+ elemsetname);
}
else if (input_format == VAL_SUTRS)
{
@@ -392,31 +514,31 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
retrieve_puts_str(wrbuf, "base", rec->info[recInfo_databaseName]);
retrieve_puts_str(wrbuf, "file", rec->info[recInfo_filename]);
retrieve_puts_str(wrbuf, "type", rec->info[recInfo_fileType]);
+ if (score >= 0)
+ retrieve_puts_int(wrbuf, "score", score);
wrbuf_printf(wrbuf,
- "score %i\n"
"rank " ZINT_FORMAT "\n"
"size %i\n"
"set zebra::%s\n",
- score,
recordAttr->staticrank,
recordAttr->recordSize,
elemsetname);
}
*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;
}
/* processing special elementsetnames zebra::index:: */
- if (elemsetname && 0 == strncmp(elemsetname, "index", 5)){
-
+ if (elemsetname && 0 == strncmp(elemsetname, "index", 5))
+ {
int ret = zebra_special_index_fetch(zh, sysno, odr, rec,
elemsetname + 5,
input_format, output_format,
@@ -480,10 +602,10 @@ int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
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;
@@ -534,6 +656,12 @@ int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
if (!(rt = recType_byName(zh->reg->recTypes, zh->res,
file_type, &clientData)))
{
+ char addinfo_str[100];
+
+ sprintf(addinfo_str, "Could not handle record type %.40s",
+ file_type);
+
+ *addinfo = odr_strdup(odr, addinfo_str);
return_code = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
}
else
@@ -549,10 +677,10 @@ int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
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;
}