X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=d60a98988f494726aa8cf95341190f3939395b1a;hb=593927cb1897c1e3163c284448eff7fee6ddad51;hp=073be377526f70c7b371bec4afee0f9b458a6b01;hpb=8fd431ba43f7305bd59d97de86ac350cb9136ef5;p=idzebra-moved-to-github.git diff --git a/index/retrieve.c b/index/retrieve.c index 073be37..d60a989 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,6 +1,6 @@ -/* $Id: retrieve.c,v 1.21 2004-05-27 09:28:01 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: retrieve.c,v 1.36 2005-10-28 07:25:30 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -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 @@ -70,7 +71,7 @@ int zebra_record_int_read (void *fh, char *buf, size_t count) int l = fc->record_int_len - fc->record_int_pos; if (l <= 0) return 0; - l = (l < (int) count) ? l : count; + 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; @@ -82,26 +83,40 @@ void zebra_record_int_end (void *fh, off_t off) fc->offset_end = off; } -int zebra_record_fetch (ZebraHandle zh, int 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) + int *rec_lenp, char **basenamep, + char **addinfo) { Record rec; char *fname, *file_type, *basename; RecType rt; struct recRetrieveCtrl retrieveCtrl; - char subType[128]; struct zebra_fetch_control fc; RecordAttr *recordAttr; void *clientData; int raw_mode = 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_")) + { + 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; + } rec = rec_get (zh->reg->records, sysno); if (!rec) { - logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno); - *basenamep = 0; + yaz_log (YLOG_DEBUG, "rec_get fail on sysno=" ZINT_FORMAT, sysno); + *basenamep = 0; return 14; } recordAttr = rec_init_attr (zh->reg->zei, rec); @@ -113,18 +128,18 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, strcpy (*basenamep, basename); if (comp && comp->which == Z_RecordComp_simple && - comp->u.simple->which == Z_ElementSetNames_generic) + comp->u.simple->which == Z_ElementSetNames_generic && + !strcmp (comp->u.simple->u.generic, "R")) { - if (!strcmp (comp->u.simple->u.generic, "R")) - raw_mode = 1; + raw_mode = 1; } - if (!(rt = recType_byName (zh->reg->recTypes, - file_type, subType, &clientData))) + if (!(rt = recType_byName (zh->reg->recTypes, zh->res, + file_type, &clientData))) { - logf (LOG_WARN, "Retrieve: Cannot handle type %s", file_type); + yaz_log (YLOG_WARN, "Retrieve: Cannot handle type %s", file_type); return 14; } - logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score); + yaz_log (YLOG_DEBUG, "retrieve localno=" ZINT_FORMAT " score=%d", sysno,score); retrieveCtrl.fh = &fc; fc.fd = -1; retrieveCtrl.fname = fname; @@ -136,7 +151,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, fc.record_int_len = rec->size[recInfo_storeData]; fc.record_int_buf = rec->info[recInfo_storeData]; fc.record_int_pos = 0; - logf (LOG_DEBUG, "Internal retrieve. %d bytes", fc.record_int_len); + yaz_log (YLOG_DEBUG, "Internal retrieve. %d bytes", fc.record_int_len); if (raw_mode) { *output_format = VAL_SUTRS; @@ -162,7 +177,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, if ((fc.fd = open (full_rep, O_BINARY|O_RDONLY)) == -1) { - logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s", + yaz_log (YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s", full_rep); rec_rm (&rec); return 14; @@ -185,7 +200,6 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, return 0; } } - retrieveCtrl.subType = subType; retrieveCtrl.localno = sysno; retrieveCtrl.score = score; retrieveCtrl.recordSize = recordAttr->recordSize; @@ -194,12 +208,62 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, 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(); - (*rt->retrieve)(clientData, &retrieveCtrl); + if (1) + { + /* snippets code */ + zebra_snippets *snippet; + +#if NEW_REC_KEYS + zebra_rec_keys_t reckeys = zebra_rec_keys_open(); + + 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_close(reckeys); +#else + struct recKeys reckeys; + reckeys.buf = rec->info[recInfo_delKeys]; + reckeys.buf_used = rec->size[recInfo_delKeys]; + zebra_snippets_rec_keys(zh, &reckeys, retrieveCtrl.doc_snippet); +#endif + + +#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; @@ -207,5 +271,6 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, close (fc.fd); rec_rm (&rec); + *addinfo = retrieveCtrl.addinfo; return retrieveCtrl.diagnostic; }