-/* $Id: retrieve.c,v 1.20 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- 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.
02111-1307, USA.
*/
-
-
#include <stdio.h>
#include <assert.h>
#ifdef WIN32
#include <io.h>
#include <process.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
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;
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);
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"))
- file_type = "text";
+ 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;
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;
+ *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;
+ }
}
else
{
}
else
strcpy (full_rep, fname);
-
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;
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;
+ }
}
- retrieveCtrl.subType = subType;
retrieveCtrl.localno = sysno;
retrieveCtrl.score = score;
retrieveCtrl.recordSize = recordAttr->recordSize;
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;
close (fc.fd);
rec_rm (&rec);
+ *addinfo = retrieveCtrl.addinfo;
return retrieveCtrl.diagnostic;
}
projects / idzebra-moved-to-github.git / blobdiff