X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fretrieve.c;h=26279985967edf10f2a6e1fb9bb9f148df25b25f;hp=1afe24f6aec635d8ba6400ce264c868a2d878c7f;hb=3e4a78274a6cb7a99f3e90967ea30c830ffbf8c3;hpb=161aa7805930f6b91ccea027e4afa4ccce41c379 diff --git a/index/retrieve.c b/index/retrieve.c index 1afe24f..2627998 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.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); } @@ -148,10 +148,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 +161,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]; @@ -191,14 +188,14 @@ int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, *output_format = VAL_TEXT_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) @@ -211,7 +208,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; } } @@ -227,8 +224,8 @@ 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; */ @@ -274,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; @@ -353,13 +356,13 @@ int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr, } 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_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; } @@ -425,20 +428,23 @@ 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_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 */ } @@ -521,11 +527,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; } @@ -596,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; @@ -650,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 @@ -665,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; }