X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=614c0f16e51e96563504dd5c0fb140a522f17784;hb=e05cb2631696372c6bdabcabe22401efe9645ab7;hp=903b7c5f2f4b1cf3eedaf8fcdbd001c8b93650ad;hpb=bd6c6c5d9ee278f702572c33b4ea56827c7ca6cb;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 903b7c5..614c0f1 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.244 2006-12-05 08:14:47 adam Exp $
+/* $Id: extract.c,v 1.246 2006-12-18 23:40:07 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -1064,8 +1064,7 @@ ZEBRA_RES zebra_rec_keys_to_snippets(ZebraHandle zh,
 	struct it_key key;
 	while (zebra_rec_keys_read(reckeys, &str, &slen, &key))
 	{
-	    char dst_buf[IT_MAX_WORD];
-	    char *dst_term = dst_buf;
+	    char *dst_term = 0;
 	    int ord;
             zint seqno;
 	    int index_type;
@@ -1362,24 +1361,30 @@ static void extract_schema_add(struct recExtractCtrl *p, Odr_oid *oid)
 void extract_flush_sort_keys(ZebraHandle zh, zint sysno,
                              int cmd, zebra_rec_keys_t reckeys)
 {
+#if 0
+    yaz_log(YLOG_LOG, "extract_flush_sort_keys cmd=%d sysno=" ZINT_FORMAT,
+            cmd, sysno);
+    extract_rec_keys_log(zh, cmd, reckeys, YLOG_LOG);
+#endif
+
     if (zebra_rec_keys_rewind(reckeys))
     {
-        SortIdx sortIdx = zh->reg->sortIdx;
+        zebra_sort_index_t si = zh->reg->sort_index;
 	size_t slen;
 	const char *str;
 	struct it_key key_in;
 
-        sortIdx_sysno (sortIdx, sysno);
+        zebra_sort_sysno(si, sysno);
 
 	while (zebra_rec_keys_read(reckeys, &str, &slen, &key_in))
         {
             int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
             
-            sortIdx_type(sortIdx, ord);
+            zebra_sort_type(si, ord);
             if (cmd == 1)
-                sortIdx_add(sortIdx, str, slen);
+                zebra_sort_add(si, str, slen);
             else
-                sortIdx_add(sortIdx, "", 1);
+                zebra_sort_delete(si);
         }
     }
 }