X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=3de8ff6c296d4c321edf1818de50bcd4cc1a5754;hb=4478d785b7769691261005c98063b98a5a5971b3;hp=acdbb7978c1337465399b304087cc8d492077141;hpb=e8393fc8e78d777294f6eabf4029b90d566cf978;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index acdbb79..3de8ff6 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,5 +1,5 @@
-/* $Id: retrieve.c,v 1.30 2005-05-31 13:01:37 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: retrieve.c,v 1.43 2006-08-14 10:40:15 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -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,
@@ -127,6 +129,57 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
 
     if (comp && comp->which == Z_RecordComp_simple &&
         comp->u.simple->which == Z_ElementSetNames_generic && 
+        !strcmp (comp->u.simple->u.generic, "_storekeys_"))
+    {
+	WRBUF wrbuf = wrbuf_alloc();
+	zebra_rec_keys_t keys = zebra_rec_keys_open();
+	zebra_rec_keys_set_buf(keys,
+			       rec->info[recInfo_delKeys],
+			       rec->size[recInfo_delKeys],
+			       0);
+	if (zebra_rec_keys_rewind(keys))
+	{
+	    size_t slen;
+	    const char *str;
+	    struct it_key key_in;
+	    while(zebra_rec_keys_read(keys, &str, &slen, &key_in))
+	    {
+		int i;
+		int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
+		int index_type;
+		const char *db = 0;
+		int set = 0;
+		int use = 0;
+		const char *string_index = 0;
+		char dst_buf[IT_MAX_WORD];
+		
+		zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db,
+					&string_index);
+
+		if (string_index)
+		    wrbuf_printf(wrbuf, "%s", string_index);
+		else
+		    wrbuf_printf(wrbuf, "set=%d,use=%d", set, use);
+
+		zebra_term_untrans(zh, index_type, dst_buf, str);
+		wrbuf_printf(wrbuf, " %s", dst_buf);
+
+		for (i = 1; i < key_in.len; i++)
+		    wrbuf_printf(wrbuf, " " ZINT_FORMAT, key_in.mem[i]);
+		wrbuf_printf(wrbuf, "\n");
+
+	    }
+	}
+	*output_format = VAL_SUTRS;
+	*rec_lenp = wrbuf_len(wrbuf);
+	*rec_bufp = odr_malloc(stream, *rec_lenp);
+	memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
+	wrbuf_free(wrbuf, 1);
+	zebra_rec_keys_close(keys);
+	return 0;
+    }
+    if (comp && comp->which == Z_RecordComp_simple &&
+        comp->u.simple->which == Z_ElementSetNames_generic && 
         !strcmp (comp->u.simple->u.generic, "R"))
     {
 	raw_mode = 1;
@@ -199,6 +252,7 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
 	}
     }
     retrieveCtrl.localno = sysno;
+    retrieveCtrl.staticrank = recordAttr->staticrank;
     retrieveCtrl.score = score;
     retrieveCtrl.recordSize = recordAttr->recordSize;
     retrieveCtrl.odr = stream;
@@ -211,16 +265,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();
+    
     if (1)
     {
-	struct recKeys reckeys;
-	reckeys.buf = rec->info[recInfo_delKeys];
-	reckeys.buf_used = rec->size[recInfo_delKeys];
+	/* 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);
 
-	print_rec_keys(zh, &reckeys);
+	zebra_snippets_destroy(snippet);
     }
-    (*rt->retrieve)(clientData, &retrieveCtrl);
+    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;
@@ -231,3 +319,11 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
     *addinfo = retrieveCtrl.addinfo;
     return retrieveCtrl.diagnostic;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+