X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=08257c4632e7917b0307cd60a6e6a026ef375e89;hb=11de0965b256736f01e55b17a603eb9ebad5ec12;hp=b623437535ecb28c3c7b9d46807510ae138fae4a;hpb=316086745a698f6c5a5e64a285cf1e764e3315b0;p=idzebra-moved-to-github.git diff --git a/index/retrieve.c b/index/retrieve.c index b623437..08257c4 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,4 +1,4 @@ -/* $Id: retrieve.c,v 1.29 2005-04-14 12:02:58 adam Exp $ +/* $Id: retrieve.c,v 1.35 2005-08-26 10:13:31 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -27,7 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #ifdef WIN32 #include #include -#else +#endif +#if HAVE_UNISTD_H #include #endif @@ -82,7 +83,8 @@ void zebra_record_int_end (void *fh, off_t off) fc->offset_end = off; } -int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream, +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, @@ -211,8 +213,45 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream, retrieveCtrl.res = zh->res; retrieveCtrl.rec_buf = 0; retrieveCtrl.rec_len = -1; + retrieveCtrl.hit_snippet = hit_snippet; + retrieveCtrl.doc_snippet = zebra_snippets_create(); - (*rt->retrieve)(clientData, &retrieveCtrl); + if (1) + { + /* snippets code */ + struct recKeys reckeys; + zebra_snippets *snippet; + reckeys.buf = rec->info[recInfo_delKeys]; + reckeys.buf_used = rec->size[recInfo_delKeys]; + + zebra_snippets_rec_keys(zh, &reckeys, retrieveCtrl.doc_snippet); + +#if 0 + /* for debugging purposes */ + yaz_log(YLOG_LOG, "DOC SNIPPET:"); + zebra_snippets_log(retrieveCtrl.doc_snippet, YLOG_LOG); + yaz_log(YLOG_LOG, "HIT SNIPPET:"); + zebra_snippets_log(retrieveCtrl.hit_snippet, YLOG_LOG); +#endif + snippet = zebra_snippets_window(retrieveCtrl.doc_snippet, + retrieveCtrl.hit_snippet, + 10); +#if 0 + /* for debugging purposes */ + 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); + } + + zebra_snippets_destroy(retrieveCtrl.doc_snippet); + *output_format = retrieveCtrl.output_format; *rec_bufp = (char *) retrieveCtrl.rec_buf; *rec_lenp = retrieveCtrl.rec_len;