X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=8c661bdcc55e17bb5ef64bc56d80e89c81fdff1a;hb=60ef5f615dd758097e842067a875307df11e4f07;hp=6415d9b7d0500673a9c211604b303a22a51d9c18;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 6415d9b..8c661bd 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.28 2005-01-15 19:38:26 adam Exp $
+/* $Id: retrieve.c,v 1.37 2005-10-28 09:22:50 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 <io.h>
 #include <process.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #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,
@@ -97,7 +99,19 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     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)
     {
@@ -114,10 +128,10 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO 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, zh->res,
 			       file_type, &clientData)))
@@ -199,8 +213,50 @@ 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 */
+	zebra_snippets *snippet;
+
+	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);
+
+
+#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;