projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed documentation of non-working 'insert', 'update' 'delete' functionality in...
[idzebra-moved-to-github.git]
/
index
/
retrieve.c
diff --git
a/index/retrieve.c
b/index/retrieve.c
index
f683530
..
d2f5398
100644
(file)
--- a/
index/retrieve.c
+++ b/
index/retrieve.c
@@
-1,4
+1,4
@@
-/* $Id: retrieve.c,v 1.63 2007-01-15 15:10:17 adam Exp $
+/* $Id: retrieve.c,v 1.66 2007-03-06 12:40:18 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-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,
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)
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);
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);
}
}
zebra_create_stream_fd(stream, fd, recordAttr->recordOffset);
}
@@
-224,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;
size_t retrieval_index_len;
const char *retrieval_type;
size_t retrieval_type_len;
- WRBUF wrbuf = 0;
zebra_rec_keys_t keys;
zebra_rec_keys_t keys;
+ int ret_code = 0;
/* set output variables before processing possible error states */
/* *rec_lenp = 0; */
/* set output variables before processing possible error states */
/* *rec_lenp = 0; */
@@
-271,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);
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;
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;
if (input_format == VAL_TEXT_XML)
{
*output_format = VAL_TEXT_XML;
@@
-350,13
+356,13
@@
int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
}
if (input_format == VAL_TEXT_XML)
wrbuf_printf(wrbuf, "</record>\n");
}
if (input_format == VAL_TEXT_XML)
wrbuf_printf(wrbuf, "</record>\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_free(wrbuf, 1);
zebra_rec_keys_close(keys);
zebra_rec_keys_close(keys);
- return 0;
+ return ret_code;
}
}
@@
-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);
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;
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)))
{
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
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);
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;
}
return return_code;
}