X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=dcd42068311279b31e09a39ae26d60c654ad5308;hb=1fde4f52fc72af8e10a600a81c6f0924105add6a;hp=a7fd69b364283c8aadf98abe4ff0742b518e1a01;hpb=11de0965b256736f01e55b17a603eb9ebad5ec12;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index a7fd69b..dcd4206 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.193 2005-08-26 10:13:30 adam Exp $
+/* $Id: extract.c,v 1.195 2005-09-16 09:58:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -43,6 +43,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #define USE_SHELLSORT 0
 
+#define REC_MULTI_SKIP 0
+
 #if USE_SHELLSORT
 static void shellsort(void *ar, int r, size_t s,
                       int (*cmp)(const void *a, const void *b))
@@ -569,6 +571,7 @@ static int file_extract_record(ZebraHandle zh,
 	
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
 
+#if REC_MULTI_SKIP
 	if (!force_update && recordAttr->runNumber ==
             zebraExplain_runNumberIncrement (zh->reg->zei, 0))
 	{
@@ -581,6 +584,7 @@ static int file_extract_record(ZebraHandle zh,
 	    logRecord (zh);
 	    return 1;
 	}
+#endif
 	/* flush old keys for sort&search etc. */
         delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
@@ -1044,6 +1048,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 	
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
 	
+#if REC_MULTI_SKIP
 	if (!force_update) {
 	    if (recordAttr->runNumber ==
 		zebraExplain_runNumberIncrement (zh->reg->zei, 0))
@@ -1057,6 +1062,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 		return ZEBRA_FAIL;
 	    }
 	}
+#endif
 
         delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
@@ -1539,7 +1545,7 @@ ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
 	char *dst = (char*) &key;
 	char dst_buf[IT_MAX_WORD];
 	char *dst_term = dst_buf;
-	int index_type, ord;
+	int index_type = 0, ord;
 
 	iscz1_decode(decode_handle, &dst, &src);
 	assert(key.len <= 4 && key.len > 2);
@@ -1549,6 +1555,7 @@ ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
 
 	zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
 				0/* db */, 0/* set */, 0/* use */);
+	assert(index_type);
 	zebra_term_untrans_iconv(zh, nmem, index_type,
 				 &dst_term, src);
 	zebra_snippets_append(snippets, seqno, ord, dst_term);