X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fretrieve.c;h=f166dc23a4bb5ed225f4ffa4e0d367b1dc64cd99;hp=f0183c7139fcc349552b30263fa01a72357f7079;hb=53f50a1b1dd002ef484a41f50f3598386335cae1;hpb=0af00389d43835ef54928dc22f7d34ae30f3c723 diff --git a/index/retrieve.c b/index/retrieve.c index f0183c7..f166dc2 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,5 +1,5 @@ -/* $Id: retrieve.c,v 1.42 2006-06-07 10:14:41 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: retrieve.c,v 1.70 2007-05-08 12:50:04 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include @@ -33,256 +33,614 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include "index.h" +#include #include +#include + +#define ZEBRA_XML_HEADER_STR "fd, buf, count); + RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, *rec); + + if ((*rec)->size[recInfo_storeData] > 0) + zebra_create_stream_mem(stream, (*rec)->info[recInfo_storeData], + (*rec)->size[recInfo_storeData]); + else + { + char full_rep[1024]; + int fd; + + if (zh->path_reg && !yaz_is_abspath((*rec)->info[recInfo_filename])){ + strcpy(full_rep, zh->path_reg); + strcat(full_rep, "/"); + strcat(full_rep, (*rec)->info[recInfo_filename]); + } + 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", + full_rep); + rec_free(rec); + return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + } + zebra_create_stream_fd(stream, fd, recordAttr->recordOffset); + } + return 0; } + + -off_t zebra_record_ext_seek (void *fh, off_t offset) +static int parse_zebra_elem(const char *elem, + const char **index, size_t *index_len, + const char **type, size_t *type_len) { - struct zebra_fetch_control *fc = (struct zebra_fetch_control *) fh; - return lseek (fc->fd, offset + fc->record_offset, SEEK_SET); + *index = 0; + *index_len = 0; + + *type = 0; + *type_len = 0; + + if (elem && *elem) + { + char *cp; + /* verify that '::' is in the beginning of *elem + and something more follows */ + if (':' != *elem + || !(elem +1) || ':' != *(elem +1) + || !(elem +2) || '\0' == *(elem +2)) + return 0; + + /* pick out info from string after '::' */ + elem = elem + 2; + cp = strchr(elem, ':'); + + if (!cp) /* index, no colon, no type */ + { + *index = elem; + *index_len = strlen(elem); + } + else if (cp[1] == '\0') /* colon, but no following type */ + { + return 0; + } + else /* index, colon and type */ + { + *index = elem; + *index_len = cp - elem; + *type = cp+1; + *type_len = strlen(cp+1); + } + } + return 1; } -off_t zebra_record_ext_tell (void *fh) + +int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr, + const char *elemsetname, + const Odr_oid *input_format, + const Odr_oid **output_format, + char **rec_bufp, int *rec_lenp) { - struct zebra_fetch_control *fc = (struct zebra_fetch_control *) fh; - return lseek (fc->fd, 0, SEEK_CUR) - fc->record_offset; + 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 (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 = 0; + 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 (!oid_oidcmp(input_format, yaz_oid_recsyn_xml)) + { + *output_format = yaz_oid_recsyn_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 (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs)) + { + *output_format = yaz_oid_recsyn_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, + const Odr_oid *input_format, + const Odr_oid **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; + 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 (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 = 0; + 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 && retrieval_type_len != 1) + { + return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; + } + + if (retrieval_index_len) + { + char retrieval_index_cstr[256]; + + 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'; + + if (zebraExplain_lookup_attr_str(zh->reg->zei, + zinfo_index_category_index, + (retrieval_type_len == 0 ? -1 : + retrieval_type[0]), + retrieval_index_cstr) == -1) + return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; + } + } + + keys = zebra_rec_keys_open(); + zebra_rec_keys_set_buf(keys, rec->info[recInfo_delKeys], + rec->size[recInfo_delKeys], 0); + + 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 (!oid_oidcmp(input_format, yaz_oid_recsyn_xml)) + { + *output_format = input_format; + wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR + " sysno=\"" ZINT_FORMAT "\"" + " set=\"zebra::index%s/\">\n", + sysno, elemsetname); + } + else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs)) + *output_format = input_format; + + 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; + const char *db = 0; + const char *string_index = 0; + size_t string_index_len; + char dst_buf[IT_MAX_WORD]; + + zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db, + &string_index); + string_index_len = strlen(string_index); + + /* process only if index is not defined, + or if defined and matching */ + if (retrieval_index == 0 + || (string_index_len == retrieval_index_len + && !memcmp(string_index, retrieval_index, + 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)) + { + zebra_term_untrans(zh, index_type, dst_buf, str); + if (strlen(dst_buf)) + { + if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml)) + { + wrbuf_printf(wrbuf, " ", + key_in.mem[key_in.len -1]); + + wrbuf_xmlputs(wrbuf, dst_buf); + wrbuf_printf(wrbuf, "\n"); + } + else + { + wrbuf_printf(wrbuf, "%s ", string_index); + + wrbuf_printf(wrbuf, "%c", index_type); + + 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); */ + wrbuf_printf(wrbuf, " %s", dst_buf); + + wrbuf_printf(wrbuf, "\n"); + } + } + + } + } + } + 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); + } + zebra_rec_keys_close(keys); + return ret_code; } -off_t zebra_record_int_seek (void *fh, off_t offset) + +static void retrieve_puts_attr(WRBUF wrbuf, const char *name, + const char *value) { - struct zebra_fetch_control *fc = (struct zebra_fetch_control *) fh; - return (off_t) (fc->record_int_pos = offset); + if (value) + { + wrbuf_printf(wrbuf, " %s=\"", name); + wrbuf_xmlputs(wrbuf, value); + wrbuf_printf(wrbuf, "\""); + } } -off_t zebra_record_int_tell (void *fh) +static void retrieve_puts_attr_int(WRBUF wrbuf, const char *name, + const int value) { - struct zebra_fetch_control *fc = (struct zebra_fetch_control *) fh; - return (off_t) fc->record_int_pos; + wrbuf_printf(wrbuf, " %s=\"%i\"", name, value); } -int zebra_record_int_read (void *fh, char *buf, size_t count) +static void retrieve_puts_str(WRBUF wrbuf, const char *name, + const char *value) { - struct zebra_fetch_control *fc = (struct zebra_fetch_control *) fh; - int l = fc->record_int_len - fc->record_int_pos; - if (l <= 0) - return 0; - l = (l < (int) count) ? l : (int) count; - memcpy (buf, fc->record_int_buf + fc->record_int_pos, l); - fc->record_int_pos += l; - return l; + if (value) + wrbuf_printf(wrbuf, "%s %s\n", name, value); } -void zebra_record_int_end (void *fh, off_t off) +static void retrieve_puts_int(WRBUF wrbuf, const char *name, + const int value) { - struct zebra_fetch_control *fc = (struct zebra_fetch_control *) fh; - fc->offset_end = off; + wrbuf_printf(wrbuf, "%s %i\n", name, value); } -int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, - zebra_snippets *hit_snippet, ODR stream, - oid_value input_format, Z_RecordComposition *comp, - oid_value *output_format, char **rec_bufp, - int *rec_lenp, char **basenamep, - char **addinfo) +int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr, + const char *elemsetname, + const Odr_oid *input_format, + const Odr_oid **output_format, + char **rec_bufp, int *rec_lenp) { Record rec; - char *fname, *file_type, *basename; - RecType rt; - struct recRetrieveCtrl retrieveCtrl; - struct zebra_fetch_control fc; - RecordAttr *recordAttr; - void *clientData; - int raw_mode = 0; + + /* set output variables before processing possible error states */ + /* *rec_lenp = 0; */ - *basenamep = 0; - *addinfo = 0; - if (comp && comp->which == Z_RecordComp_simple && - comp->u.simple->which == Z_ElementSetNames_generic && - !strcmp (comp->u.simple->u.generic, "_sysno_")) + + + /* processing zebra::meta::sysno elemset without fetching binary data */ + if (elemsetname && 0 == strcmp(elemsetname, "meta::sysno")) { - char rec_str[60]; - sprintf(rec_str, ZINT_FORMAT, sysno); - *output_format = VAL_SUTRS; - *rec_lenp = strlen(rec_str); - *rec_bufp = odr_strdup(stream, rec_str); - return 0; + int ret = 0; + WRBUF wrbuf = wrbuf_alloc(); + if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs)) + { + wrbuf_printf(wrbuf, ZINT_FORMAT, sysno); + *output_format = input_format; + } + else if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml)) + { + wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR + " sysno=\"" ZINT_FORMAT "\"/>\n", + sysno); + *output_format = input_format; + } + *rec_lenp = wrbuf_len(wrbuf); + if (*rec_lenp) + *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf)); + else + ret = YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST; + wrbuf_destroy(wrbuf); + return ret; } - rec = rec_get (zh->reg->records, sysno); - if (!rec) + + /* processing special elementsetname zebra::index:: for sort elements */ + if (elemsetname && 0 == strncmp(elemsetname, "index", 5)) { - yaz_log (YLOG_DEBUG, "rec_get fail on sysno=" ZINT_FORMAT, sysno); - *basenamep = 0; - return 14; + 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 */ } - recordAttr = rec_init_attr (zh->reg->zei, rec); - file_type = rec->info[recInfo_fileType]; - fname = rec->info[recInfo_filename]; - basename = rec->info[recInfo_databaseName]; - *basenamep = (char *) odr_malloc (stream, strlen(basename)+1); - strcpy (*basenamep, basename); - if (comp && comp->which == Z_RecordComp_simple && - comp->u.simple->which == Z_ElementSetNames_generic && - !strcmp (comp->u.simple->u.generic, "_storekeys_")) - { - WRBUF wrbuf = wrbuf_alloc(); - zebra_rec_keys_t keys = zebra_rec_keys_open(); - zebra_rec_keys_set_buf(keys, - rec->info[recInfo_delKeys], - rec->size[recInfo_delKeys], - 0); - if (zebra_rec_keys_rewind(keys)) - { - size_t slen; - const char *str; - struct it_key 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; - const char *db = 0; - int set = 0; - int use = 0; - const char *string_index = 0; - char dst_buf[IT_MAX_WORD]; - - zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db, - &string_index); - - if (string_index) - wrbuf_printf(wrbuf, "%s", string_index); - else - wrbuf_printf(wrbuf, "set=%d,use=%d", set, use); - - zebra_term_untrans(zh, index_type, dst_buf, str); - wrbuf_printf(wrbuf, " %s", dst_buf); - - for (i = 1; i < key_in.len; i++) - wrbuf_printf(wrbuf, " " ZINT_FORMAT, key_in.mem[i]); - wrbuf_printf(wrbuf, "\n"); - - } - } - *output_format = VAL_SUTRS; - *rec_lenp = wrbuf_len(wrbuf); - *rec_bufp = odr_malloc(stream, *rec_lenp); - memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp); - wrbuf_free(wrbuf, 1); - zebra_rec_keys_close(keys); - return 0; - } - if (comp && comp->which == Z_RecordComp_simple && - comp->u.simple->which == Z_ElementSetNames_generic && - !strcmp (comp->u.simple->u.generic, "R")) + /* fetching binary record up for all other display elementsets */ + rec = rec_get(zh->reg->records, sysno); + if (!rec) { - raw_mode = 1; + yaz_log(YLOG_WARN, "rec_get fail on sysno=" ZINT_FORMAT, sysno); + return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; } - if (!(rt = recType_byName (zh->reg->recTypes, zh->res, - file_type, &clientData))) + + /* processing special elementsetnames zebra::data */ + if (elemsetname && 0 == strcmp(elemsetname, "data")) { - yaz_log (YLOG_WARN, "Retrieve: Cannot handle type %s", file_type); - return 14; + struct ZebraRecStream stream; + RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec); + zebra_create_record_stream(zh, &rec, &stream); + *output_format = input_format; + *rec_lenp = recordAttr->recordSize; + *rec_bufp = (char *) odr_malloc(odr, *rec_lenp); + stream.readf(&stream, *rec_bufp, *rec_lenp); + stream.destroy(&stream); + rec_free(&rec); + return 0; } - yaz_log (YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d", sysno,score); - retrieveCtrl.fh = &fc; - fc.fd = -1; - retrieveCtrl.fname = fname; - if (rec->size[recInfo_storeData] > 0) + + /* only accept XML and SUTRS requests from now */ + if (oid_oidcmp(input_format, yaz_oid_recsyn_xml) + && oid_oidcmp(input_format, yaz_oid_recsyn_sutrs)) { - retrieveCtrl.readf = zebra_record_int_read; - retrieveCtrl.seekf = zebra_record_int_seek; - retrieveCtrl.tellf = zebra_record_int_tell; - fc.record_int_len = rec->size[recInfo_storeData]; - fc.record_int_buf = rec->info[recInfo_storeData]; - fc.record_int_pos = 0; - yaz_log (YLOG_DEBUG, "Internal retrieve. %d bytes", fc.record_int_len); - if (raw_mode) - { - *output_format = VAL_SUTRS; - *rec_lenp = rec->size[recInfo_storeData]; - *rec_bufp = (char *) odr_malloc(stream, *rec_lenp); - memcpy(*rec_bufp, rec->info[recInfo_storeData], *rec_lenp); - rec_rm (&rec); - return 0; - } + yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s", + elemsetname); + return YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST; } - else + + + /* processing special elementsetnames zebra::meta:: */ + if (elemsetname && 0 == strcmp(elemsetname, "meta")) { - char full_rep[1024]; + int ret = 0; + WRBUF wrbuf = wrbuf_alloc(); + RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec); - if (zh->path_reg && !yaz_is_abspath (fname)) + if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml)) { - strcpy (full_rep, zh->path_reg); - strcat (full_rep, "/"); - strcat (full_rep, fname); + *output_format = input_format; + + 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]); + 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 - strcpy (full_rep, fname); - - if ((fc.fd = open (full_rep, O_BINARY|O_RDONLY)) == -1) + else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs)) { - yaz_log (YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s", - full_rep); - rec_rm (&rec); - return 14; + *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]); + retrieve_puts_str(wrbuf, "type", rec->info[recInfo_fileType]); + if (score >= 0) + retrieve_puts_int(wrbuf, "score", score); + + wrbuf_printf(wrbuf, + "rank " ZINT_FORMAT "\n" + "size %i\n" + "set zebra::%s\n", + recordAttr->staticrank, + recordAttr->recordSize, + elemsetname); } - fc.record_offset = recordAttr->recordOffset; - - retrieveCtrl.readf = zebra_record_ext_read; - retrieveCtrl.seekf = zebra_record_ext_seek; - retrieveCtrl.tellf = zebra_record_ext_tell; - - zebra_record_ext_seek (retrieveCtrl.fh, 0); - if (raw_mode) - { - *output_format = VAL_SUTRS; - *rec_lenp = recordAttr->recordSize; - *rec_bufp = (char *) odr_malloc(stream, *rec_lenp); - zebra_record_ext_read(&fc, *rec_bufp, *rec_lenp); - rec_rm (&rec); - close (fc.fd); - return 0; - } + *rec_lenp = wrbuf_len(wrbuf); + if (*rec_lenp) + *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf)); + else + ret = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + + wrbuf_destroy(wrbuf); + rec_free(&rec); + return ret; } - retrieveCtrl.localno = sysno; - retrieveCtrl.staticrank = recordAttr->staticrank; - retrieveCtrl.score = score; - retrieveCtrl.recordSize = recordAttr->recordSize; - retrieveCtrl.odr = stream; - retrieveCtrl.input_format = retrieveCtrl.output_format = input_format; - retrieveCtrl.comp = comp; - retrieveCtrl.encoding = zh->record_encoding; - retrieveCtrl.diagnostic = 0; - retrieveCtrl.addinfo = 0; - retrieveCtrl.dh = zh->reg->dh; - retrieveCtrl.res = zh->res; - retrieveCtrl.rec_buf = 0; - retrieveCtrl.rec_len = -1; - retrieveCtrl.hit_snippet = hit_snippet; - retrieveCtrl.doc_snippet = zebra_snippets_create(); - - if (1) + + /* processing special elementsetnames zebra::index:: */ + if (elemsetname && 0 == strncmp(elemsetname, "index", 5)) { - /* snippets code */ - zebra_snippets *snippet; + int ret = zebra_special_index_fetch(zh, sysno, odr, rec, + elemsetname + 5, + input_format, output_format, + rec_bufp, rec_lenp); + + rec_free(&rec); + return ret; + } + + if (rec) + rec_free(&rec); + return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; +} + +int zebra_record_fetch(ZebraHandle zh, zint sysno, int score, + zebra_snippets *hit_snippet, ODR odr, + const Odr_oid *input_format, Z_RecordComposition *comp, + const Odr_oid **output_format, + char **rec_bufp, int *rec_lenp, char **basenamep, + char **addinfo) +{ + Record rec; + char *fname, *file_type, *basename; + const char *elemsetname; + struct ZebraRecStream stream; + RecordAttr *recordAttr; + void *clientData; + int return_code = 0; + + *basenamep = 0; + *addinfo = 0; + elemsetname = yaz_get_esn(comp); + + /* processing zebra special elementset names of form 'zebra:: */ + if (elemsetname && 0 == strncmp(elemsetname, "zebra::", 7)) + return zebra_special_fetch(zh, sysno, score, odr, + elemsetname + 7, + input_format, output_format, + rec_bufp, rec_lenp); + + + /* processing all other element set names */ + rec = rec_get(zh->reg->records, sysno); + if (!rec) + { + yaz_log(YLOG_WARN, "rec_get fail on sysno=" ZINT_FORMAT, sysno); + *basenamep = 0; + return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + } + + + recordAttr = rec_init_attr(zh->reg->zei, rec); + + 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); + + yaz_log(YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d", + sysno, score); + + return_code = zebra_create_record_stream(zh, &rec, &stream); + + if (rec) + { + zebra_snippets *snippet; zebra_rec_keys_t reckeys = zebra_rec_keys_open(); - + RecType rt; + struct recRetrieveCtrl retrieveCtrl; + + retrieveCtrl.stream = &stream; + retrieveCtrl.fname = fname; + retrieveCtrl.localno = sysno; + retrieveCtrl.staticrank = recordAttr->staticrank; + retrieveCtrl.score = score; + retrieveCtrl.recordSize = recordAttr->recordSize; + retrieveCtrl.odr = odr; + retrieveCtrl.input_format = retrieveCtrl.output_format = input_format; + retrieveCtrl.comp = comp; + retrieveCtrl.encoding = zh->record_encoding; + retrieveCtrl.diagnostic = 0; + retrieveCtrl.addinfo = 0; + retrieveCtrl.dh = zh->reg->dh; + 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_snippets_rec_keys(zh, reckeys, retrieveCtrl.doc_snippet); + zebra_rec_keys_to_snippets(zh, reckeys, retrieveCtrl.doc_snippet); zebra_rec_keys_close(reckeys); - #if 0 /* for debugging purposes */ yaz_log(YLOG_LOG, "DOC SNIPPET:"); @@ -298,27 +656,39 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, yaz_log(YLOG_LOG, "WINDOW SNIPPET:"); zebra_snippets_log(snippet, YLOG_LOG); #endif - (*rt->retrieve)(clientData, &retrieveCtrl); - zebra_snippets_destroy(snippet); - } - else - { - (*rt->retrieve)(clientData, &retrieveCtrl); - } + 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 + { + (*rt->retrieve)(clientData, &retrieveCtrl); + return_code = retrieveCtrl.diagnostic; - zebra_snippets_destroy(retrieveCtrl.doc_snippet); + *output_format = retrieveCtrl.output_format; + *rec_bufp = (char *) retrieveCtrl.rec_buf; + *rec_lenp = retrieveCtrl.rec_len; + *addinfo = retrieveCtrl.addinfo; + } - *output_format = retrieveCtrl.output_format; - *rec_bufp = (char *) retrieveCtrl.rec_buf; - *rec_lenp = retrieveCtrl.rec_len; - if (fc.fd != -1) - close (fc.fd); - rec_rm (&rec); + zebra_snippets_destroy(snippet); + zebra_snippets_destroy(retrieveCtrl.doc_snippet); - *addinfo = retrieveCtrl.addinfo; - return retrieveCtrl.diagnostic; + stream.destroy(&stream); + rec_free(&rec); + } + + return return_code; } + /* * Local variables: * c-basic-offset: 4