X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=bcb155608414bc1f917cce8360c43b08d0db5031;hb=1b5ef8265837240930862dddd2d7ef963a0cc211;hp=1afe24f6aec635d8ba6400ce264c868a2d878c7f;hpb=161aa7805930f6b91ccea027e4afa4ccce41c379;p=idzebra-moved-to-github.git diff --git a/index/retrieve.c b/index/retrieve.c index 1afe24f..bcb1556 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,5 +1,5 @@ -/* $Id: retrieve.c,v 1.61 2006-12-18 23:40:07 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: retrieve.c,v 1.69 2007-04-16 21:54:37 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -35,14 +35,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "index.h" #include #include - +#include #define ZEBRA_XML_HEADER_STR "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); } @@ -121,8 +121,8 @@ 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, + const int *input_format, + const int **output_format, char **rec_bufp, int *rec_lenp) { const char *retrieval_index; @@ -133,11 +133,12 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, 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; } @@ -148,10 +149,8 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; } - if (retrieval_type_len != 0 && retrieval_type_len != 1) - { - 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) { @@ -163,11 +162,10 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, ord = zebraExplain_lookup_attr_str(zh->reg->zei, zinfo_index_category_sort, - (retrieval_type_len == 0 ? -1 : - retrieval_type[0]), + retrieval_type[0], retrieval_index_cstr); if (ord == -1) - return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; + return -1; /* is not a sort index */ else { char dst_buf[IT_MAX_WORD]; @@ -186,24 +184,24 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, 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::sort%s/\">\n", + " 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"); wrbuf_printf(wrbuf, "\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); @@ -211,7 +209,7 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, *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; } } @@ -219,26 +217,27 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, 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 int *input_format, + const int **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; } @@ -274,22 +273,27 @@ 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; - - 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)) { @@ -320,7 +324,8 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr, 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, " \n"); } - else if (input_format == VAL_SUTRS){ + else + { wrbuf_printf(wrbuf, "%s ", string_index); wrbuf_printf(wrbuf, "%c", index_type); @@ -340,8 +346,8 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr, 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"); @@ -351,15 +357,15 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr, } } } - if (input_format == VAL_TEXT_XML) + if (!oid_oidcmp(input_format, yaz_oid_recsyn_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_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; } @@ -394,10 +400,10 @@ static void retrieve_puts_int(WRBUF wrbuf, const char *name, } 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 int *input_format, + const int **output_format, + char **rec_bufp, int *rec_lenp) { Record rec; @@ -411,34 +417,37 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr, { 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; } - /* processing special elementsetnames zebra::sort:: */ - if (elemsetname && 0 == strncmp(elemsetname, "sort", 4)) + /* processing special elementsetname zebra::index:: for sort elements */ + if (elemsetname && 0 == strncmp(elemsetname, "index", 5)) { - return zebra_special_sort_fetch(zh, sysno, odr, - elemsetname + 4, - input_format, output_format, - rec_bufp, rec_lenp); + 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 */ } @@ -466,7 +475,8 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr, } /* 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); @@ -481,9 +491,9 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr, 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); @@ -501,9 +511,9 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr, 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]); @@ -521,11 +531,11 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr, } *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; } @@ -550,8 +560,8 @@ int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr, 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 int *input_format, Z_RecordComposition *comp, + const int **output_format, char **rec_bufp, int *rec_lenp, char **basenamep, char **addinfo) { @@ -596,10 +606,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; @@ -650,6 +660,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 @@ -665,10 +681,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; }