X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=2da428272edcc19d9f37479da64ac00abc37965a;hb=c33b816c4435530975e7b5edfd5b2334201ea5a4;hp=f32e57536b0b19ceea6a471e5a05c2decbb86217;hpb=0f3b8bcc6fe2e3beeec7c834d9a64dca48a4f1b7;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index f32e575..2da4282 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.179 2005-04-28 08:20:39 adam Exp $
+/* $Id: extract.c,v 1.190 2005-08-19 09:45:24 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -25,7 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <ctype.h>
 #ifdef WIN32
 #include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <fcntl.h>
@@ -85,51 +86,57 @@ static void extract_init (struct recExtractCtrl *p, RecWord *w)
 {
     w->zebra_maps = p->zebra_maps;
     w->seqno = 1;
+#if NATTR
+#else
     w->attrSet = VAL_BIB1;
     w->attrUse = 1016;
-    w->attrStr = 0;
-    w->reg_type = 'w';
+#endif
+    w->index_name = 0;
+    w->index_type = 'w';
     w->extractCtrl = p;
     w->record_id = 0;
     w->section_id = 0;
 }
 
-static const char **searchRecordKey (ZebraHandle zh,
-                                     struct recKeys *reckeys,
-				     int attrSetS, int attrUseS)
+static void searchRecordKey(ZebraHandle zh,
+			    const struct recKeys *reckeys,
+			    int attrSetS, int attrUseS,
+			    const char **ws, int ws_length)
 {
-    static const char *ws[32];
     void *decode_handle = iscz1_start();
     int off = 0;
     int startSeq = -1;
     int seqno = 0;
     int i;
+    int ch;
 
-    for (i = 0; i<32; i++)
+    for (i = 0; i<ws_length; i++)
         ws[i] = NULL;
 
+    ch = zebraExplain_lookup_attr_su_any_index(zh->reg->zei,
+					       attrSetS, attrUseS);
+    if (ch < 0)
+	return ;
+
     while (off < reckeys->buf_used)
     {
         const char *src = reckeys->buf + off;
         struct it_key key;
 	char *dst = (char*) &key;
-	int attrSet, attrUse;
 
 	iscz1_decode(decode_handle, &dst, &src);
-	assert(key.len < 4 && key.len > 2);
+	assert(key.len <= 4 && key.len > 2);
 
-	attrSet = (int) key.mem[0] >> 16;
-	attrUse = (int) key.mem[0] & 65535;
 	seqno = (int) key.mem[key.len-1];
 
-	if (attrUseS == attrUse && attrSetS == attrSet)
+	if (key.mem[0] == ch)
         {
             int woff;
 
             if (startSeq == -1)
                 startSeq = seqno;
             woff = seqno - startSeq;
-            if (woff >= 0 && woff < 31)
+            if (woff >= 0 && woff < ws_length)
                 ws[woff] = src;
         }
 
@@ -139,7 +146,6 @@ static const char **searchRecordKey (ZebraHandle zh,
     }
     iscz1_stop(decode_handle);
     assert (off == reckeys->buf_used);
-    return ws;
 }
 
 struct file_read_info {
@@ -148,8 +154,6 @@ struct file_read_info {
     off_t file_moffset;     /* offset of rec/rec boundary */
     int file_more;
     int fd;
-    char *sdrbuf;
-    int sdrmax;
 };
 
 static struct file_read_info *file_read_start (int fd)
@@ -160,8 +164,8 @@ static struct file_read_info *file_read_start (int fd)
     fi->fd = fd;
     fi->file_max = 0;
     fi->file_moffset = 0;
-    fi->sdrbuf = 0;
-    fi->sdrmax = 0;
+    fi->file_offset = 0;
+    fi->file_more = 0;
     return fi;
 }
 
@@ -174,8 +178,6 @@ static off_t file_seek (void *handle, off_t offset)
 {
     struct file_read_info *p = (struct file_read_info *) handle;
     p->file_offset = offset;
-    if (p->sdrbuf)
-	return offset;
     return lseek (p->fd, offset, SEEK_SET);
 }
 
@@ -190,16 +192,7 @@ static int file_read (void *handle, char *buf, size_t count)
     struct file_read_info *p = (struct file_read_info *) handle;
     int fd = p->fd;
     int r;
-    if (p->sdrbuf)
-    {
-	r = count;
-	if (r > p->sdrmax - p->file_offset)
-	    r = p->sdrmax - p->file_offset;
-	if (r)
-	    memcpy (buf, p->sdrbuf + p->file_offset, r);
-    }
-    else
-	r = read (fd, buf, count);
+    r = read (fd, buf, count);
     if (r > 0)
     {
         p->file_offset += r;
@@ -209,23 +202,15 @@ static int file_read (void *handle, char *buf, size_t count)
     return r;
 }
 
-static void file_begin (void *handle)
-{
-    struct file_read_info *p = (struct file_read_info *) handle;
-
-    p->file_offset = p->file_moffset;
-    if (!p->sdrbuf && p->file_moffset)
-        lseek (p->fd, p->file_moffset, SEEK_SET);
-    p->file_more = 0;
-}
-
 static void file_end (void *handle, off_t offset)
 {
     struct file_read_info *p = (struct file_read_info *) handle;
 
-    assert (p->file_more == 0);
-    p->file_more = 1;
-    p->file_moffset = offset;
+    if (offset != p->file_moffset)
+    {
+	p->file_moffset = offset;
+	p->file_more = 1;
+    }
 }
 
 static char *fileMatchStr (ZebraHandle zh,
@@ -235,7 +220,6 @@ static char *fileMatchStr (ZebraHandle zh,
     static char dstBuf[2048];      /* static here ??? */
     char *dst = dstBuf;
     const char *s = spec;
-    static const char **w;
 
     while (1)
     {
@@ -245,6 +229,7 @@ static char *fileMatchStr (ZebraHandle zh,
             break;
         if (*s == '(')
         {
+	    const char *ws[32];
 	    char attset_str[64], attname_str[64];
 	    data1_attset *attset;
 	    int i;
@@ -277,8 +262,7 @@ static char *fileMatchStr (ZebraHandle zh,
 		else
 		    attUse = atoi (attname_str);
 	    }
-            w = searchRecordKey (zh, reckeys, attSet, attUse);
-            assert (w);
+            searchRecordKey (zh, reckeys, attSet, attUse, ws, 32);
 
             if (*s == ')')
             {
@@ -294,15 +278,15 @@ static char *fileMatchStr (ZebraHandle zh,
             s++;
 
             for (i = 0; i<32; i++)
-                if (matchFlag[i] && w[i])
+                if (matchFlag[i] && ws[i])
                 {
                     if (first)
                     {
                         *dst++ = ' ';
                         first = 0;
                     }
-                    strcpy (dst, w[i]);
-                    dst += strlen(w[i]);
+                    strcpy (dst, ws[i]);
+                    dst += strlen(ws[i]);
                 }
             if (first)
             {
@@ -390,7 +374,21 @@ void create_rec_keys_codec(struct recKeys *keys)
     keys->buf_used = 0;
     iscz1_reset(keys->codec_handle);
 }
-     
+
+static void init_extractCtrl(ZebraHandle zh, struct recExtractCtrl *ctrl)
+{
+    int i;
+    for (i = 0; i<256; i++)
+    {
+	if (zebra_maps_is_positioned(zh->reg->zebra_maps, i))
+	    ctrl->seqno[i] = 1;
+	else
+	    ctrl->seqno[i] = 0;
+    }
+    ctrl->zebra_maps = zh->reg->zebra_maps;
+    ctrl->flagShowRecords = !zh->m_flag_rw;
+}
+
 static int file_extract_record(ZebraHandle zh,
 			       SYSNO *sysno, const char *fname,
 			       int deleteFlag,
@@ -405,6 +403,7 @@ static int file_extract_record(ZebraHandle zh,
     SYSNO sysnotmp;
     Record rec;
     off_t recordOffset = 0;
+    struct recExtractCtrl extractCtrl;
     
     /* announce database */
     if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
@@ -416,16 +415,13 @@ static int file_extract_record(ZebraHandle zh,
 
     if (fi->fd != -1)
     {
-	struct recExtractCtrl extractCtrl;
-
         /* we are going to read from a file, so prepare the extraction */
-	int i;
-
 	create_rec_keys_codec(&zh->reg->keys);
-
+#if NATTR
+	create_rec_keys_codec(&zh->reg->sortKeys);
+#else
 	zh->reg->sortKeys.buf_used = 0;
-
-	
+#endif
 	recordOffset = fi->file_moffset;
         extractCtrl.handle = zh;
 	extractCtrl.offset = fi->file_moffset;
@@ -439,19 +435,13 @@ static int file_extract_record(ZebraHandle zh,
 	extractCtrl.schemaAdd = extract_schema_add;
 	extractCtrl.dh = zh->reg->dh;
 	extractCtrl.match_criteria[0] = '\0';
+	extractCtrl.staticrank = 0;
+	
 	extractCtrl.first_record = fi->file_offset ? 0 : 1;
 
 	extract_set_store_data_prepare(&extractCtrl);
 
-	for (i = 0; i<256; i++)
-	{
-	    if (zebra_maps_is_positioned(zh->reg->zebra_maps, i))
-		extractCtrl.seqno[i] = 1;
-	    else
-		extractCtrl.seqno[i] = 0;
-	}
-	extractCtrl.zebra_maps = zh->reg->zebra_maps;
-	extractCtrl.flagShowRecords = !zh->m_flag_rw;
+	init_extractCtrl(zh, &extractCtrl);
 
         if (!zh->m_flag_rw)
             printf ("File: %s " PRINTF_OFF_T "\n", fname, recordOffset);
@@ -491,7 +481,7 @@ static int file_extract_record(ZebraHandle zh,
             return 0;
         }
         if (extractCtrl.match_criteria[0])
-            matchStr = extractCtrl.match_criteria;
+            matchStr = extractCtrl.match_criteria;	
     }
 
     /* perform match if sysno not known and if match criteria is specified */
@@ -552,13 +542,15 @@ static int file_extract_record(ZebraHandle zh,
         *sysno = rec->sysno;
 
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
+	recordAttr->staticrank = extractCtrl.staticrank;
 
         if (matchStr)
         {
             dict_insert (zh->reg->matchDict, matchStr, sizeof(*sysno), sysno);
         }
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
+				 recordAttr->staticrank);
 
         zh->records_inserted++;
     }
@@ -566,7 +558,11 @@ static int file_extract_record(ZebraHandle zh,
     {
         /* record already exists */
         struct recKeys delkeys;
+#if NATTR
+	struct recKeys sortKeys;
+#else
         struct sortKeys sortKeys;
+#endif
 
         rec = rec_get (zh->reg->records, *sysno);
         assert (rec);
@@ -585,6 +581,7 @@ static int file_extract_record(ZebraHandle zh,
 	    logRecord (zh);
 	    return 1;
 	}
+	/* flush old keys for sort&search etc. */
         delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
 
@@ -592,7 +589,8 @@ static int file_extract_record(ZebraHandle zh,
         sortKeys.buf = rec->info[recInfo_sortKeys];
 
 	extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
+        extract_flushRecordKeys (zh, *sysno, 0, &delkeys,
+				 recordAttr->staticrank); /* old values */  
         if (deleteFlag)
         {
             /* record going to be deleted */
@@ -627,11 +625,14 @@ static int file_extract_record(ZebraHandle zh,
             }
             else
             {
+		/* flush new keys for sort&search etc */
                 if (zh->records_processed < zh->m_file_verbose_limit)
                     yaz_log (YLOG_LOG, "update %s %s " PRINTF_OFF_T,
                         zh->m_record_type, fname, recordOffset);
+		recordAttr->staticrank = extractCtrl.staticrank;
                 extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-                extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+                extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
+					 recordAttr->staticrank);
                 zh->records_updated++;
             }
         }
@@ -689,7 +690,6 @@ static int file_extract_record(ZebraHandle zh,
         rec->size[recInfo_storeData] = zh->store_data_size;
         rec->info[recInfo_storeData] = zh->store_data_buf;
 	zh->store_data_buf = 0;
-	file_end(fi, fi->file_offset);
     }
     else if (zh->m_store_data)
     {
@@ -819,10 +819,17 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
     fi = file_read_start (fd);
     do
     {
-        file_begin (fi);
+	fi->file_moffset = fi->file_offset;
+	fi->file_more = 0;  /* file_end not called (yet) */
         r = file_extract_record (zh, sysno, fname, deleteFlag, fi, 1,
 				 recType, recTypeClientData);
-    } while (r && !sysno && fi->file_more);
+	if (fi->file_more)
+	{   /* file_end has been called so reset offset .. */
+	    fi->file_offset = fi->file_moffset;
+	    lseek(fi->fd, fi->file_moffset, SEEK_SET);
+	}
+    }
+    while (r && !sysno);
     file_read_stop (fi);
     if (fd != -1)
         close (fd);
@@ -849,7 +856,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 {
     RecordAttr *recordAttr;
     struct recExtractCtrl extractCtrl;
-    int i, r;
+    int r;
     const char *matchStr = 0;
     RecType recType = NULL;
     void *clientData;
@@ -878,9 +885,11 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
     extractCtrl.fh = &fc;
 
     create_rec_keys_codec(&zh->reg->keys);
-
+#if NATTR
+    create_rec_keys_codec(&zh->reg->sortKeys);
+#else
     zh->reg->sortKeys.buf_used = 0;
-
+#endif
     if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
     {
         if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0], 
@@ -918,16 +927,11 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
     extractCtrl.schemaAdd = extract_schema_add;
     extractCtrl.dh = zh->reg->dh;
     extractCtrl.handle = zh;
-    extractCtrl.zebra_maps = zh->reg->zebra_maps;
-    extractCtrl.flagShowRecords = 0;
     extractCtrl.match_criteria[0] = '\0';
-    for (i = 0; i<256; i++)
-    {
-	if (zebra_maps_is_positioned(zh->reg->zebra_maps, i))
-	    extractCtrl.seqno[i] = 1;
-	else
-	    extractCtrl.seqno[i] = 0;
-    }
+    extractCtrl.staticrank = 0;
+    
+    init_extractCtrl(zh, &extractCtrl);
+
     extract_set_store_data_prepare(&extractCtrl);
 
     r = (*recType->extract)(clientData, &extractCtrl);
@@ -1003,6 +1007,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
         *sysno = rec->sysno;
 
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
+	recordAttr->staticrank = extractCtrl.staticrank;
 
         if (matchStr)
         {
@@ -1010,7 +1015,8 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
                          sizeof(*sysno), sysno);
         }
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
+				 recordAttr->staticrank);
 
         zh->records_inserted++;
     } 
@@ -1018,7 +1024,11 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
     {
         /* record already exists */
         struct recKeys delkeys;
+#if NATTR
+	struct recKeys sortKeys;
+#else
         struct sortKeys sortKeys;
+#endif
 
 	if (!allow_update)
 	{
@@ -1055,7 +1065,8 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
         sortKeys.buf = rec->info[recInfo_sortKeys];
 
 	extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
+        extract_flushRecordKeys (zh, *sysno, 0, &delkeys,
+				 recordAttr->staticrank);
         if (delete_flag)
         {
             /* record going to be deleted */
@@ -1100,8 +1111,10 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 		if (show_progress)
 		    yaz_log (YLOG_LOG, "update %s %s %ld", recordType,
 			     pr_fname, (long) recordOffset);
+		recordAttr->staticrank = extractCtrl.staticrank;
                 extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-                extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+                extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys, 
+					 recordAttr->staticrank);
                 zh->records_updated++;
             }
         }
@@ -1158,7 +1171,15 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 
     /* update store data */
     xfree (rec->info[recInfo_storeData]);
-    if (zh->m_store_data)
+
+    /* update store data */
+    if (zh->store_data_buf)
+    {
+        rec->size[recInfo_storeData] = zh->store_data_size;
+        rec->info[recInfo_storeData] = zh->store_data_buf;
+	zh->store_data_buf = 0;
+    }
+    else if (zh->m_store_data)
     {
         rec->size[recInfo_storeData] = recordAttr->recordSize;
         rec->info[recInfo_storeData] = (char *)
@@ -1188,7 +1209,6 @@ int explain_extract (void *handle, Record rec, data1_node *n)
 {
     ZebraHandle zh = (ZebraHandle) handle;
     struct recExtractCtrl extractCtrl;
-    int i;
 
     if (zebraExplain_curDatabase (zh->reg->zei,
 				  rec->info[recInfo_databaseName]))
@@ -1200,18 +1220,21 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     }
 
     create_rec_keys_codec(&zh->reg->keys);
-
+#if NATTR
+    create_rec_keys_codec(&zh->reg->sortKeys);
+#else
     zh->reg->sortKeys.buf_used = 0;
-    
+#endif
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;
     extractCtrl.schemaAdd = extract_schema_add;
     extractCtrl.dh = zh->reg->dh;
-    for (i = 0; i<256; i++)
-	extractCtrl.seqno[i] = 0;
-    extractCtrl.zebra_maps = zh->reg->zebra_maps;
+
+    init_extractCtrl(zh, &extractCtrl);
+
     extractCtrl.flagShowRecords = 0;
     extractCtrl.match_criteria[0] = '\0';
+    extractCtrl.staticrank = 0;
     extractCtrl.handle = handle;
     extractCtrl.first_record = 1;
     
@@ -1223,7 +1246,11 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     if (rec->size[recInfo_delKeys])
     {
 	struct recKeys delkeys;
+#if NATTR
+	struct recKeys sortkeys;
+#else
 	struct sortKeys sortkeys;
+#endif
 
 	delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
@@ -1232,9 +1259,9 @@ int explain_extract (void *handle, Record rec, data1_node *n)
 	sortkeys.buf = rec->info[recInfo_sortKeys];
 
 	extract_flushSortKeys (zh, rec->sysno, 0, &sortkeys);
-	extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys);
+	extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys, 0);
     }
-    extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys);
+    extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys, 0);
     extract_flushSortKeys (zh, rec->sysno, 1, &zh->reg->sortKeys);
 
     xfree (rec->info[recInfo_delKeys]);
@@ -1253,7 +1280,8 @@ int explain_extract (void *handle, Record rec, data1_node *n)
 }
 
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
-                              int cmd, struct recKeys *reckeys)
+                              int cmd, struct recKeys *reckeys,
+			      zint staticrank)
 {
     void *decode_handle = iscz1_start();
     int off = 0;
@@ -1281,11 +1309,14 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
     while (off < reckeys->buf_used)
     {
         const char *src = reckeys->buf + off;
-        struct it_key key;
-	char *dst = (char*) &key;
+        struct it_key key_in;
+	struct it_key key_out;
+	char *dst = (char*) &key_in;
+	zint *keyp = key_out.mem;
+	size_t key_idx = 0;
 
 	iscz1_decode(decode_handle, &dst, &src);
-	assert(key.len == 4);
+	assert(key_in.len == 4);
 
         if (zh->reg->key_buf_used + 1024 > 
             (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
@@ -1295,7 +1326,7 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
         (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =
 	    (char*)zh->reg->key_buf + zh->reg->key_buf_used;
 
-	ch = (int) key.mem[0];  /* ordinal for field/use/attribute */
+	ch = (int) key_in.mem[0];  /* ordinal for field/use/attribute */
 
 	zh->reg->key_buf_used +=
 	    key_SU_encode (ch,((char*)zh->reg->key_buf) +
@@ -1306,17 +1337,24 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
         ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = '\0';
         ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = cmd;
 
-        key.len = 3;
-	if (key.mem[1]) /* filter specified record ID */
-	    key.mem[0] = key.mem[1];
+	if (zh->m_staticrank) /* rank config enabled ? */
+	{
+	    *keyp++ = staticrank;
+	    key_out.len = 4;
+	}
+	else
+	    key_out.len = 3;
+
+	if (key_in.mem[1]) /* filter specified record ID */
+	    *keyp++ = key_in.mem[1];
 	else
-	    key.mem[0] = sysno;
-	key.mem[1] = key.mem[2];  /* section_id */
-	key.mem[2] = key.mem[3];  /* sequence .. */
+	    *keyp++ = sysno;
+	*keyp++ = key_in.mem[2];  /* section_id */
+	*keyp++ = key_in.mem[3];  /* sequence .. */
 
         memcpy ((char*)zh->reg->key_buf + zh->reg->key_buf_used,
-		&key, sizeof(key));
-        (zh->reg->key_buf_used) += sizeof(key);
+		&key_out, sizeof(key_out));
+        (zh->reg->key_buf_used) += sizeof(key_out);
         off = src - reckeys->buf;
     }
     assert (off == reckeys->buf_used);
@@ -1458,11 +1496,11 @@ void extract_flushWriteKeys (ZebraHandle zh, int final)
 }
 
 void extract_add_it_key (ZebraHandle zh,
+			 struct recKeys *keys,
 			 int reg_type,
 			 const char *str, int slen, struct it_key *key)
 {
     char *dst;
-    struct recKeys *keys = &zh->reg->keys;
     const char *src = (char*) key;
     
     if (keys->buf_used+1024 > keys->buf_max)
@@ -1477,13 +1515,90 @@ void extract_add_it_key (ZebraHandle zh,
 
     iscz1_encode(keys->codec_handle, &dst, &src);
 
+#if REG_TYPE_PREFIX
     *dst++ = reg_type;
+#endif
     memcpy (dst, str, slen);
     dst += slen;
     *dst++ = '\0';
     keys->buf_used = dst - keys->buf;
 }
 
+ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
+				  zebra_snippets *snippets)
+{
+   void *decode_handle = iscz1_start();
+    int off = 0;
+    int seqno = 0;
+    NMEM nmem = nmem_create();
+
+    yaz_log(YLOG_LOG, "zebra_rec_keys_snippets buf=%p sz=%d", reckeys->buf,
+	    reckeys->buf_used);
+    assert(reckeys->buf);
+    while (off < reckeys->buf_used)
+    {
+        const char *src = reckeys->buf + off;
+        struct it_key key;
+	char *dst = (char*) &key;
+	char dst_buf[IT_MAX_WORD];
+	char *dst_term = dst_buf;
+
+	iscz1_decode(decode_handle, &dst, &src);
+	assert(key.len <= 4 && key.len > 2);
+
+	seqno = (int) key.mem[key.len-1];
+
+	zebra_term_untrans_iconv(zh, nmem, src[0], &dst_term, src+1);
+	zebra_snippets_append(snippets, seqno, src[0], key.mem[0], dst_term);
+        while (*src++)
+	    ;
+        off = src - reckeys->buf;
+	nmem_reset(nmem);
+    }
+    nmem_destroy(nmem);
+    iscz1_stop(decode_handle);
+    return ZEBRA_OK;
+}
+
+void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys)
+{
+    void *decode_handle = iscz1_start();
+    int off = 0;
+    int seqno = 0;
+    NMEM nmem = nmem_create();
+
+    yaz_log(YLOG_LOG, "print_rec_keys buf=%p sz=%d", reckeys->buf,
+	    reckeys->buf_used);
+    assert(reckeys->buf);
+    while (off < reckeys->buf_used)
+    {
+        const char *src = reckeys->buf + off;
+        struct it_key key;
+	char *dst = (char*) &key;
+	int attrSet, attrUse;
+	char dst_buf[IT_MAX_WORD];
+	char *dst_term = dst_buf;
+
+	iscz1_decode(decode_handle, &dst, &src);
+	assert(key.len <= 4 && key.len > 2);
+
+	attrSet = (int) key.mem[0] >> 16;
+	attrUse = (int) key.mem[0] & 65535;
+	seqno = (int) key.mem[key.len-1];
+
+	zebra_term_untrans_iconv(zh, nmem, src[0], &dst_term, src+1);
+	
+	yaz_log(YLOG_LOG, "ord=" ZINT_FORMAT " seqno=%d term=%s",
+		key.mem[0], seqno, dst_term); 
+        while (*src++)
+	    ;
+        off = src - reckeys->buf;
+	nmem_reset(nmem);
+    }
+    nmem_destroy(nmem);
+    iscz1_stop(decode_handle);
+}
+
 void extract_add_index_string (RecWord *p, const char *str, int length)
 {
     struct it_key key;
@@ -1492,17 +1607,23 @@ void extract_add_index_string (RecWord *p, const char *str, int length)
     ZebraExplainInfo zei = zh->reg->zei;
     int ch;
 
-    if (p->attrStr)
+    if (p->index_name)
     {
-	ch = zebraExplain_lookup_attr_str(zei, p->attrStr);
+	ch = zebraExplain_lookup_attr_str(zei, p->index_type, p->index_name);
 	if (ch < 0)
-	    ch = zebraExplain_add_attr_str(zei, p->attrStr);
+	    ch = zebraExplain_add_attr_str(zei, p->index_type, p->index_name);
     }
     else
     {
-	ch = zebraExplain_lookup_attr_su(zei, p->attrSet, p->attrUse);
+#if NATTR
+	return;
+#else
+	ch = zebraExplain_lookup_attr_su(zei, p->index_type, 
+					 p->attrSet, p->attrUse);
 	if (ch < 0)
-	    ch = zebraExplain_add_attr_su(zei, p->attrSet, p->attrUse);
+	    ch = zebraExplain_add_attr_su(zei, p->index_type,
+					  p->attrSet, p->attrUse);
+#endif
     }
     key.len = 4;
     key.mem[0] = ch;
@@ -1517,12 +1638,44 @@ void extract_add_index_string (RecWord *p, const char *str, int length)
 	    p->attrSet, p->attrUse, p->record_id, p->section_id, p->seqno);
 #endif
 
-    extract_add_it_key(p->extractCtrl->handle,  p->reg_type, str,
+    extract_add_it_key(p->extractCtrl->handle, 
+		       &zh->reg->keys,
+		       p->index_type, str,
 		       length, &key);
 }
 
-static void extract_add_sort_string (RecWord *p, const char *str,
-				     int length)
+#if NATTR
+static void extract_add_sort_string (RecWord *p, const char *str, int length)
+{
+    struct it_key key;
+
+    ZebraHandle zh = p->extractCtrl->handle;
+    ZebraExplainInfo zei = zh->reg->zei;
+    int ch;
+
+    if (p->index_name)
+    {
+	ch = zebraExplain_lookup_attr_str(zei, p->index_type, p->index_name);
+	if (ch < 0)
+	    ch = zebraExplain_add_attr_str(zei, p->index_type, p->index_name);
+    }
+    else
+    {
+	return;
+    }
+    key.len = 4;
+    key.mem[0] = ch;
+    key.mem[1] = p->record_id;
+    key.mem[2] = p->section_id;
+    key.mem[3] = p->seqno;
+
+    extract_add_it_key(p->extractCtrl->handle, 
+		       &zh->reg->sortKeys,
+		       p->index_type, str,
+		       length, &key);
+}
+#else
+static void extract_add_sort_string (RecWord *p, const char *str, int length)
 {
     ZebraHandle zh = p->extractCtrl->handle;
     struct sortKeys *sk = &zh->reg->sortKeys;
@@ -1557,11 +1710,12 @@ static void extract_add_sort_string (RecWord *p, const char *str,
     memcpy (sk->buf + off, str, length);
     sk->buf_used = off + length;
 }
+#endif
 
 void extract_add_string (RecWord *p, const char *string, int length)
 {
     assert (length > 0);
-    if (zebra_maps_is_sort (p->zebra_maps, p->reg_type))
+    if (zebra_maps_is_sort (p->zebra_maps, p->index_type))
 	extract_add_sort_string (p, string, length);
     else
 	extract_add_index_string (p, string, length);
@@ -1576,7 +1730,7 @@ static void extract_add_incomplete_field (RecWord *p)
     yaz_log(YLOG_DEBUG, "Incomplete field, w='%.*s'", p->term_len, p->term_buf);
 
     if (remain > 0)
-	map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0);
+	map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, 0);
 
     while (map)
     {
@@ -1588,7 +1742,8 @@ static void extract_add_incomplete_field (RecWord *p)
 	{
 	    remain = p->term_len - (b - p->term_buf);
 	    if (remain > 0)
-		map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0);
+		map = zebra_maps_input(p->zebra_maps, p->index_type, &b,
+				       remain, 0);
 	    else
 		map = 0;
 	}
@@ -1603,7 +1758,7 @@ static void extract_add_incomplete_field (RecWord *p)
 		buf[i++] = *(cp++);
 	    remain = p->term_len - (b - p->term_buf);
 	    if (remain > 0)
-		map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0);
+		map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, 0);
 	    else
 		map = 0;
 	}
@@ -1625,7 +1780,7 @@ static void extract_add_complete_field (RecWord *p)
 	    p->term_len, p->term_buf);
 
     if (remain > 0)
-	map = zebra_maps_input (p->zebra_maps, p->reg_type, &b, remain, 1);
+	map = zebra_maps_input (p->zebra_maps, p->index_type, &b, remain, 1);
 
     while (remain > 0 && i < IT_MAX_WORD)
     {
@@ -1636,7 +1791,7 @@ static void extract_add_complete_field (RecWord *p)
 	    if (remain > 0)
 	    {
 		int first = i ? 0 : 1;  /* first position */
-		map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, first);
+		map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, first);
 	    }
 	    else
 		map = 0;
@@ -1665,7 +1820,7 @@ static void extract_add_complete_field (RecWord *p)
 	    remain = p->term_len  - (b - p->term_buf);
 	    if (remain > 0)
 	    {
-		map = zebra_maps_input (p->zebra_maps, p->reg_type, &b,
+		map = zebra_maps_input (p->zebra_maps, p->index_type, &b,
 					remain, 0);
 	    }
 	    else
@@ -1686,13 +1841,13 @@ void extract_token_add (RecWord *p)
              p->reg_type, p->attrSet, p->attrUse, p->seqno, p->length,
              p->string);
 #endif
-    if ((wrbuf = zebra_replace(p->zebra_maps, p->reg_type, 0,
+    if ((wrbuf = zebra_replace(p->zebra_maps, p->index_type, 0,
 			       p->term_buf, p->term_len)))
     {
 	p->term_buf = wrbuf_buf(wrbuf);
 	p->term_len = wrbuf_len(wrbuf);
     }
-    if (zebra_maps_is_complete (p->zebra_maps, p->reg_type))
+    if (zebra_maps_is_complete (p->zebra_maps, p->index_type))
 	extract_add_complete_field (p);
     else
 	extract_add_incomplete_field(p);
@@ -1729,6 +1884,41 @@ void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
     zebraExplain_addSchema (zh->reg->zei, oid);
 }
 
+#if NATTR
+void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
+                            int cmd, struct recKeys *reckeys)
+{
+    SortIdx sortIdx = zh->reg->sortIdx;
+    void *decode_handle = iscz1_start();
+    int off = 0;
+    int ch = 0;
+
+    while (off < reckeys->buf_used)
+    {
+        const char *src = reckeys->buf + off;
+        struct it_key key;
+	char *dst = (char*) &key;
+
+	iscz1_decode(decode_handle, &dst, &src);
+	assert(key.len == 4);
+
+	ch = (int) key.mem[0];  /* ordinal for field/use/attribute */
+
+        sortIdx_type(sortIdx, ch);
+        if (cmd == 1)
+            sortIdx_add(sortIdx, src, strlen(src));
+        else
+            sortIdx_add(sortIdx, "", 1);
+	
+	src += strlen(src);
+        src++;
+
+        off = src - reckeys->buf;
+    }
+    assert (off == reckeys->buf_used);
+    iscz1_stop(decode_handle);
+}
+#else
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
                             int cmd, struct sortKeys *sk)
 {
@@ -1753,6 +1943,7 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
         off += slen;
     }
 }
+#endif
 
 void encode_key_init (struct encode_info *i)
 {