X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=c342d7d8fd1d7058a368cd7ec5fe96fe85b7f23a;hb=6dfee19bc1cec29ff5ec5e9cd8021d1354a6126e;hp=5cd2ec56dc074c02f42e3b6b22d0eb705b287c7d;hpb=47eeb5384a8fae8bcac8afb8a84782ca094683f9;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 5cd2ec5..c342d7d 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -1,4 +1,4 @@
-/* $Id: retrieve.c,v 1.32 2005-06-14 20:28:54 adam Exp $
+/* $Id: retrieve.c,v 1.38 2006-04-25 13:52:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -129,6 +129,58 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
 
     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 = 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,
+					 &set, &use, &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;
@@ -219,26 +271,33 @@ int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score,
     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);
+	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);