X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=f92ca7f932421d38a6640e8b9a72aad576a1d06f;hb=c6959870998f868e6a0e9201739fb54aef696bc6;hp=8f0cf0bef0b9a3e70df42aaffc72bdbc634d44ff;hpb=49d0ee122a9f86ec2967b577dcc297c501785edd;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 8f0cf0b..f92ca7f 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.178 2005-04-15 10:47:48 adam Exp $
+/* $Id: extract.c,v 1.200 2005-12-09 10:45:04 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>
@@ -79,65 +80,65 @@ static void logRecord (ZebraHandle zh)
     }
 }
 
+static void extract_set_store_data_prepare(struct recExtractCtrl *p);
+
 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,
+			    zebra_rec_keys_t 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;
 
-    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);
+    ch = zebraExplain_lookup_attr_su_any_index(zh->reg->zei,
+					       attrSetS, attrUseS);
+    if (ch < 0)
+	return ;
 
-	attrSet = (int) key.mem[0] >> 16;
-	attrUse = (int) key.mem[0] & 65535;
-	seqno = (int) key.mem[key.len-1];
-
-	if (attrUseS == attrUse && attrSetS == attrSet)
-        {
-            int woff;
-
-            if (startSeq == -1)
-                startSeq = seqno;
-            woff = seqno - startSeq;
-            if (woff >= 0 && woff < 31)
-                ws[woff] = src;
-        }
+    if (zebra_rec_keys_rewind(reckeys))
+    {
+	int startSeq = -1;
+	const char *str;
+	size_t slen;
+	struct it_key key;
+	zint seqno;
+	while (zebra_rec_keys_read(reckeys, &str, &slen, &key))
+	{
+	    assert(key.len <= 4 && key.len > 2);
 
-        while (*src++)
-	    ;
-        off = src - reckeys->buf;
+	    seqno = key.mem[key.len-1];
+	    
+	    if (key.mem[0] == ch)
+	    {
+		int woff;
+		
+		if (startSeq == -1)
+		    startSeq = seqno;
+		woff = seqno - startSeq;
+		if (woff >= 0 && woff < ws_length)
+		    ws[woff] = str;
+	    }
+	}
     }
-    iscz1_stop(decode_handle);
-    assert (off == reckeys->buf_used);
-    return ws;
 }
 
 struct file_read_info {
@@ -146,8 +147,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)
@@ -158,8 +157,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;
 }
 
@@ -172,8 +171,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);
 }
 
@@ -188,16 +185,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;
@@ -207,33 +195,24 @@ 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,
-                           struct recKeys *reckeys,
+			   zebra_rec_keys_t reckeys,
                            const char *fname, const char *spec)
 {
     static char dstBuf[2048];      /* static here ??? */
     char *dst = dstBuf;
     const char *s = spec;
-    static const char **w;
 
     while (1)
     {
@@ -243,6 +222,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;
@@ -275,8 +255,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 == ')')
             {
@@ -292,15 +271,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)
             {
@@ -383,17 +362,27 @@ struct recordLogInfo {
     struct recordGroup *rGroup;
 };
 
-void create_rec_keys_codec(struct recKeys *keys)
+static void init_extractCtrl(ZebraHandle zh, struct recExtractCtrl *ctrl)
 {
-    keys->buf_used = 0;
-    iscz1_reset(keys->codec_handle);
+    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,
 			       struct file_read_info *fi,
-			       int force_update)
+			       int force_update,
+			       RecType recType,
+			       void *recTypeClientData)
 {
     RecordAttr *recordAttr;
     int r;
@@ -401,17 +390,8 @@ static int file_extract_record(ZebraHandle zh,
     SYSNO sysnotmp;
     Record rec;
     off_t recordOffset = 0;
-    RecType recType;
-    void *clientData;
+    struct recExtractCtrl extractCtrl;
     
-    if (!(recType =
-	  recType_byName (zh->reg->recTypes, zh->res, zh->m_record_type,
-			  &clientData)))
-    {
-        yaz_log (YLOG_WARN, "No such record type: %s", zh->m_record_type);
-        return 0;
-    }
-
     /* announce database */
     if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
     {
@@ -422,16 +402,16 @@ 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);
+	zebra_rec_keys_reset(zh->reg->keys);
 
+#if NATTR
+	zebra_rec_keys_reset(zh->reg->sortKeys);
+#else
 	zh->reg->sortKeys.buf_used = 0;
-	
+#endif
 	recordOffset = fi->file_moffset;
+        extractCtrl.handle = zh;
 	extractCtrl.offset = fi->file_moffset;
 	extractCtrl.readf = file_read;
 	extractCtrl.seekf = file_seek;
@@ -443,16 +423,13 @@ static int file_extract_record(ZebraHandle zh,
 	extractCtrl.schemaAdd = extract_schema_add;
 	extractCtrl.dh = zh->reg->dh;
 	extractCtrl.match_criteria[0] = '\0';
-        extractCtrl.handle = zh;
-	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;
+	extractCtrl.staticrank = 0;
+	
+	extractCtrl.first_record = fi->file_offset ? 0 : 1;
+
+	extract_set_store_data_prepare(&extractCtrl);
+
+	init_extractCtrl(zh, &extractCtrl);
 
         if (!zh->m_flag_rw)
             printf ("File: %s " PRINTF_OFF_T "\n", fname, recordOffset);
@@ -463,7 +440,7 @@ static int file_extract_record(ZebraHandle zh,
             yaz_log_init_prefix2 (msg);
         }
 
-        r = (*recType->extract)(clientData, &extractCtrl);
+        r = (*recType->extract)(recTypeClientData, &extractCtrl);
 
         yaz_log_init_prefix2 (0);
 	if (r == RECCTRL_EXTRACT_EOF)
@@ -492,7 +469,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 */
@@ -503,8 +480,7 @@ static int file_extract_record(ZebraHandle zh,
 
         if (matchStr == 0 && zh->m_record_id && *zh->m_record_id)
         {
-        
-            matchStr = fileMatchStr (zh, &zh->reg->keys, fname, 
+            matchStr = fileMatchStr (zh, zh->reg->keys, fname, 
 				     zh->m_record_id);
 	    if (!matchStr)
 	    {
@@ -522,7 +498,7 @@ static int file_extract_record(ZebraHandle zh,
 	    }
 	}
     }
-    if (! *sysno && zh->reg->keys.buf_used == 0)
+    if (! *sysno && zebra_rec_keys_empty(zh->reg->keys)	)
     {
          /* the extraction process returned no information - the record
             is probably empty - unless flagShowRecords is in use */
@@ -553,61 +529,70 @@ 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);
         }
+#if NATTR
+	extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
+#else
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
-
+#endif
+        extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
+				 recordAttr->staticrank);
         zh->records_inserted++;
     }
     else
     {
         /* record already exists */
-        struct recKeys delkeys;
+	zebra_rec_keys_t delkeys = zebra_rec_keys_open();
+
+#if NATTR
+	zebra_rec_keys_t sortKeys = zebra_rec_keys_open();
+#else
         struct sortKeys sortKeys;
+#endif
 
         rec = rec_get (zh->reg->records, *sysno);
         assert (rec);
 	
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
 
-	if (!force_update && recordAttr->runNumber ==
-            zebraExplain_runNumberIncrement (zh->reg->zei, 0))
-	{
-            yaz_log (YLOG_LOG, "run number = " ZINT_FORMAT,
-			    recordAttr->runNumber);
-	    yaz_log (YLOG_LOG, "skipped %s %s " PRINTF_OFF_T,
-                     zh->m_record_type, fname, recordOffset);
-	    extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
-	    rec_rm (&rec);
-	    logRecord (zh);
-	    return 1;
-	}
-        delkeys.buf_used = rec->size[recInfo_delKeys];
-	delkeys.buf = rec->info[recInfo_delKeys];
-
+	zebra_rec_keys_set_buf(delkeys,
+			       rec->info[recInfo_delKeys],
+			       rec->size[recInfo_delKeys],
+			       0);
+
+#if NATTR
+	zebra_rec_keys_set_buf(sortKeys,
+			       rec->info[recInfo_sortKeys],
+			       rec->size[recInfo_sortKeys],
+			       0);
+	extract_flushSortKeys (zh, *sysno, 0, sortKeys);
+#else
         sortKeys.buf_used = rec->size[recInfo_sortKeys];
         sortKeys.buf = rec->info[recInfo_sortKeys];
-
 	extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
+#endif
+
+        extract_flushRecordKeys (zh, *sysno, 0, delkeys,
+				 recordAttr->staticrank); /* old values */  
         if (deleteFlag)
         {
             /* record going to be deleted */
-            if (!delkeys.buf_used)
+            if (zebra_rec_keys_empty(delkeys))
             {
                 yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T,
-                      zh->m_record_type, fname, recordOffset);
-                yaz_log (YLOG_WARN, "cannot delete file above, storeKeys false");
+			 zh->m_record_type, fname, recordOffset);
+                yaz_log (YLOG_WARN, "cannot delete file above, storeKeys false (1)");
             }
             else
             {
                 if (zh->records_processed < zh->m_file_verbose_limit)
                     yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T,
-                         zh->m_record_type, fname, recordOffset);
+			     zh->m_record_type, fname, recordOffset);
                 zh->records_deleted++;
                 if (matchStr)
                     dict_delete (zh->reg->matchDict, matchStr);
@@ -619,23 +604,24 @@ static int file_extract_record(ZebraHandle zh,
         }
         else
         {
-            /* record going to be updated */
-            if (!delkeys.buf_used)
-            {
+	    /* 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);
-                yaz_log (YLOG_WARN, "cannot update file above, storeKeys false");
-            }
-            else
-            {
-                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);
-                extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-                extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
-                zh->records_updated++;
-            }
+	    recordAttr->staticrank = extractCtrl.staticrank;
+#if NATTR
+            extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
+#else
+            extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
+#endif
+            extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
+					 recordAttr->staticrank);
+            zh->records_updated++;
         }
+	zebra_rec_keys_close(delkeys);
+#if NATTR
+	zebra_rec_keys_close(sortKeys);
+#endif
     }
     /* update file type */
     xfree (rec->info[recInfo_fileType]);
@@ -649,12 +635,11 @@ static int file_extract_record(ZebraHandle zh,
 
     /* update delete keys */
     xfree (rec->info[recInfo_delKeys]);
-    if (zh->reg->keys.buf_used > 0 && zh->m_store_keys == 1)
+    if (!zebra_rec_keys_empty(zh->reg->keys) && zh->m_store_keys == 1)
     {
-        rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
-        rec->info[recInfo_delKeys] = zh->reg->keys.buf;
-        zh->reg->keys.buf = NULL;
-        zh->reg->keys.buf_max = 0;
+	zebra_rec_keys_get_buf(zh->reg->keys,
+			       &rec->info[recInfo_delKeys],
+			       &rec->size[recInfo_delKeys]);
     }
     else
     {
@@ -665,10 +650,16 @@ static int file_extract_record(ZebraHandle zh,
     /* update sort keys */
     xfree (rec->info[recInfo_sortKeys]);
 
+#if NATTR
+    zebra_rec_keys_get_buf(zh->reg->sortKeys,
+			   &rec->info[recInfo_sortKeys],
+			   &rec->size[recInfo_sortKeys]);
+#else
     rec->size[recInfo_sortKeys] = zh->reg->sortKeys.buf_used;
     rec->info[recInfo_sortKeys] = zh->reg->sortKeys.buf;
     zh->reg->sortKeys.buf = NULL;
     zh->reg->sortKeys.buf_max = 0;
+#endif
 
     /* save file size of original record */
     zebraExplain_recordBytesIncrement (zh->reg->zei,
@@ -685,7 +676,13 @@ static int file_extract_record(ZebraHandle zh,
 
     /* update store data */
     xfree (rec->info[recInfo_storeData]);
-    if (zh->m_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 *)
@@ -732,6 +729,8 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
     char ext_res[128];
     struct file_read_info *fi;
     const char *original_record_type = 0;
+    RecType recType;
+    void *recTypeClientData;
 
     if (!zh->m_group || !*zh->m_group)
         *gprefix = '\0';
@@ -770,6 +769,21 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
         zh->m_record_id = res_get (zh->res, ext_res);
     }
 
+    if (!(recType =
+	  recType_byName (zh->reg->recTypes, zh->res, zh->m_record_type,
+			  &recTypeClientData)))
+    {
+        yaz_log(YLOG_WARN, "No such record type: %s", zh->m_record_type);
+        return 0;
+    }
+
+    switch(recType->version)
+    {
+    case 0:
+	break;
+    default:
+	yaz_log(YLOG_WARN, "Bad filter version: %s", zh->m_record_type);
+    }
     if (sysno && deleteFlag)
         fd = -1;
     else
@@ -796,9 +810,17 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
     fi = file_read_start (fd);
     do
     {
-        file_begin (fi);
-        r = file_extract_record (zh, sysno, fname, deleteFlag, fi, 1);
-    } while (r && !sysno && fi->file_more);
+	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);
+	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);
@@ -812,20 +834,21 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
   If not, and a record is provided, then sysno is got from there
   
  */
-ZEBRA_RES buffer_extract_record (ZebraHandle zh, 
-				 const char *buf, size_t buf_size,
-				 int delete_flag,
-				 int test_mode, 
-				 const char *recordType,
-				 SYSNO *sysno,
-				 const char *match_criteria,
-				 const char *fname,
-				 int force_update,
-				 int allow_update)
+ZEBRA_RES buffer_extract_record(ZebraHandle zh, 
+				const char *buf, size_t buf_size,
+				int delete_flag,
+				int test_mode, 
+				const char *recordType,
+				SYSNO *sysno,
+				const char *match_criteria,
+				const char *fname,
+				int force_update,
+				int allow_update)
 {
+    SYSNO sysno0 = 0;
     RecordAttr *recordAttr;
     struct recExtractCtrl extractCtrl;
-    int i, r;
+    int r;
     const char *matchStr = 0;
     RecType recType = NULL;
     void *clientData;
@@ -850,12 +873,16 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
     extractCtrl.seekf = zebra_record_int_seek;
     extractCtrl.tellf = zebra_record_int_tell;
     extractCtrl.endf = zebra_record_int_end;
+    extractCtrl.first_record = 1;
     extractCtrl.fh = &fc;
 
-    create_rec_keys_codec(&zh->reg->keys);
+    zebra_rec_keys_reset(zh->reg->keys);
 
+#if NATTR
+    zebra_rec_keys_reset(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], 
@@ -893,16 +920,12 @@ 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);
 
@@ -920,19 +943,19 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 	yaz_log (YLOG_WARN, "extract error: no such filter");
 	return ZEBRA_FAIL;
     }
-    /* match criteria */
-    matchStr = NULL;
 
     if (extractCtrl.match_criteria[0])
 	match_criteria = extractCtrl.match_criteria;
 
-    if (! *sysno) {
-        char *rinfo;
+    if (!sysno) {
+
+	sysno = &sysno0;
+
         if (match_criteria && *match_criteria) {
             matchStr = match_criteria;
         } else {
             if (zh->m_record_id && *zh->m_record_id) {
-                matchStr = fileMatchStr (zh, &zh->reg->keys, pr_fname, 
+                matchStr = fileMatchStr (zh, zh->reg->keys, pr_fname, 
                                          zh->m_record_id);
 		if (!matchStr)
                 {
@@ -942,7 +965,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
             }
         }
         if (matchStr) {
-            rinfo = dict_lookup (zh->reg->matchDict, matchStr);
+	    char *rinfo = dict_lookup (zh->reg->matchDict, matchStr);
             if (rinfo)
 	    {
 		assert(*rinfo == sizeof(*sysno));
@@ -950,7 +973,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 	    }
         }
     }
-    if (zh->reg->keys.buf_used == 0)
+    if (zebra_rec_keys_empty(zh->reg->keys))
     {
 	/* the extraction process returned no information - the record
 	   is probably empty - unless flagShowRecords is in use */
@@ -963,8 +986,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
         /* new record */
         if (delete_flag)
         {
-	    if (show_progress)
-		yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
+	    yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
 			 pr_fname, (long) recordOffset);
             yaz_log (YLOG_WARN, "cannot delete record above (seems new)");
             return ZEBRA_FAIL;
@@ -977,27 +999,39 @@ ZEBRA_RES buffer_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);
         }
+#if NATTR
+	extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
+#else
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
-
+#endif
+	
+#if 0
+	print_rec_keys(zh, zh->reg->keys);
+#endif
+        extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
+			 recordAttr->staticrank);
         zh->records_inserted++;
     } 
     else
     {
         /* record already exists */
-        struct recKeys delkeys;
+	zebra_rec_keys_t delkeys = zebra_rec_keys_open();
+#if NATTR
+	zebra_rec_keys_t sortKeys = zebra_rec_keys_open();
+#else
         struct sortKeys sortKeys;
+#endif
 
 	if (!allow_update)
 	{
-	    if (show_progress)
-		yaz_log (YLOG_LOG, "skipped %s %s %ld", 
+	    yaz_log (YLOG_LOG, "skipped %s %s %ld", 
 			 recordType, pr_fname, (long) recordOffset);
 	    logRecord(zh);
 	    return ZEBRA_FAIL;
@@ -1007,41 +1041,37 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
         assert (rec);
 	
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
-	
-	if (!force_update) {
-	    if (recordAttr->runNumber ==
-		zebraExplain_runNumberIncrement (zh->reg->zei, 0))
-	    {
-		if (show_progress)
-		    yaz_log (YLOG_LOG, "skipped %s %s %ld", recordType,
-			     pr_fname, (long) recordOffset);
-		extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
-		rec_rm (&rec);
-		logRecord(zh);
-		return ZEBRA_FAIL;
-	    }
-	}
-
-        delkeys.buf_used = rec->size[recInfo_delKeys];
-	delkeys.buf = rec->info[recInfo_delKeys];
 
+	zebra_rec_keys_set_buf(delkeys,
+			       rec->info[recInfo_delKeys],
+			       rec->size[recInfo_delKeys],
+			       0);
+#if NATTR
+	zebra_rec_keys_set_buf(sortKeys,
+			       rec->info[recInfo_sortKeys],
+			       rec->size[recInfo_sortKeys],
+			       0);
+#else
         sortKeys.buf_used = rec->size[recInfo_sortKeys];
         sortKeys.buf = rec->info[recInfo_sortKeys];
+#endif
 
+#if NATTR
+	extract_flushSortKeys (zh, *sysno, 0, sortKeys);
+#else
 	extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
-        extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
+#endif
+        extract_flushRecordKeys (zh, *sysno, 0, delkeys,
+				 recordAttr->staticrank);
         if (delete_flag)
         {
             /* record going to be deleted */
-            if (!delkeys.buf_used)
+            if (zebra_rec_keys_empty(delkeys))
             {
-		if (show_progress)
-		{
-		    yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
-			     pr_fname, (long) recordOffset);
-		    yaz_log (YLOG_WARN, "cannot delete file above, "
-			     "storeKeys false");
-		}
+		yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
+		     pr_fname, (long) recordOffset);
+		yaz_log (YLOG_WARN, "cannot delete file above, "
+			     "storeKeys false (3)");
 	    }
             else
             {
@@ -1059,26 +1089,23 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
         }
         else
         {
-            /* record going to be updated */
-            if (!delkeys.buf_used)
-            {
-		if (show_progress)
-		{
-		    yaz_log (YLOG_LOG, "update %s %s %ld", recordType,
-			     pr_fname, (long) recordOffset);
-		    yaz_log (YLOG_WARN, "cannot update file above, storeKeys false");
-		}
-	    }
-            else
-            {
-		if (show_progress)
+	    if (show_progress)
 		    yaz_log (YLOG_LOG, "update %s %s %ld", recordType,
 			     pr_fname, (long) recordOffset);
-                extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-                extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
-                zh->records_updated++;
-            }
+	    recordAttr->staticrank = extractCtrl.staticrank;
+#if NATTR
+            extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
+#else
+            extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
+#endif
+            extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, 
+					 recordAttr->staticrank);
+            zh->records_updated++;
         }
+	zebra_rec_keys_close(delkeys);
+#if NATTR
+	zebra_rec_keys_close(sortKeys);
+#endif
     }
     /* update file type */
     xfree (rec->info[recInfo_fileType]);
@@ -1092,26 +1119,30 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh,
 
     /* update delete keys */
     xfree (rec->info[recInfo_delKeys]);
-    if (zh->reg->keys.buf_used > 0 && zh->m_store_keys == 1)
+    if (!zebra_rec_keys_empty(zh->reg->keys) && zh->m_store_keys == 1)
     {
-        rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
-        rec->info[recInfo_delKeys] = zh->reg->keys.buf;
-        zh->reg->keys.buf = NULL;
-        zh->reg->keys.buf_max = 0;
+	zebra_rec_keys_get_buf(zh->reg->keys,
+			       &rec->info[recInfo_delKeys],
+			       &rec->size[recInfo_delKeys]);
     }
     else
     {
         rec->info[recInfo_delKeys] = NULL;
         rec->size[recInfo_delKeys] = 0;
     }
-
     /* update sort keys */
     xfree (rec->info[recInfo_sortKeys]);
 
+#if NATTR
+    zebra_rec_keys_get_buf(zh->reg->sortKeys,
+			   &rec->info[recInfo_sortKeys],
+			   &rec->size[recInfo_sortKeys]);
+#else
     rec->size[recInfo_sortKeys] = zh->reg->sortKeys.buf_used;
     rec->info[recInfo_sortKeys] = zh->reg->sortKeys.buf;
     zh->reg->sortKeys.buf = NULL;
     zh->reg->sortKeys.buf_max = 0;
+#endif
 
     /* save file size of original record */
     zebraExplain_recordBytesIncrement (zh->reg->zei,
@@ -1132,7 +1163,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 *)
@@ -1162,7 +1201,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]))
@@ -1173,62 +1211,91 @@ int explain_extract (void *handle, Record rec, data1_node *n)
             abort ();
     }
 
-    create_rec_keys_codec(&zh->reg->keys);
-
-    zh->reg->sortKeys.buf_used = 0;
+    zebra_rec_keys_reset(zh->reg->keys);
     
+#if NATTR
+    zebra_rec_keys_reset(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;
+    
+    extract_set_store_data_prepare(&extractCtrl);
 
     if (n)
 	grs_extract_tree(&extractCtrl, n);
 
     if (rec->size[recInfo_delKeys])
     {
-	struct recKeys delkeys;
+	zebra_rec_keys_t delkeys = zebra_rec_keys_open();
+	
+#if NATTR
+	zebra_rec_keys_t sortkeys = zebra_rec_keys_open();
+#else
 	struct sortKeys sortkeys;
+#endif
 
-	delkeys.buf_used = rec->size[recInfo_delKeys];
-	delkeys.buf = rec->info[recInfo_delKeys];
-
+	zebra_rec_keys_set_buf(delkeys, rec->info[recInfo_delKeys],
+			       rec->size[recInfo_delKeys],
+			       0);
+	extract_flushRecordKeys (zh, rec->sysno, 0, delkeys, 0);
+	zebra_rec_keys_close(delkeys);
+#if NATTR
+	zebra_rec_keys_set_buf(sortkeys, rec->info[recInfo_sortKeys],
+			       rec->size[recInfo_sortKeys],
+			       0);
+
+	extract_flushSortKeys (zh, rec->sysno, 0, sortkeys);
+	zebra_rec_keys_close(sortkeys);
+#else
 	sortkeys.buf_used = rec->size[recInfo_sortKeys];
 	sortkeys.buf = rec->info[recInfo_sortKeys];
-
 	extract_flushSortKeys (zh, rec->sysno, 0, &sortkeys);
-	extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys);
+#endif
     }
-    extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys);
+    extract_flushRecordKeys (zh, rec->sysno, 1, zh->reg->keys, 0);
+#if NATTR
+    extract_flushSortKeys (zh, rec->sysno, 1, zh->reg->sortKeys);
+#else
     extract_flushSortKeys (zh, rec->sysno, 1, &zh->reg->sortKeys);
+#endif
 
     xfree (rec->info[recInfo_delKeys]);
-    rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
-    rec->info[recInfo_delKeys] = zh->reg->keys.buf;
-    zh->reg->keys.buf = NULL;
-    zh->reg->keys.buf_max = 0;
+    zebra_rec_keys_get_buf(zh->reg->keys,
+			   &rec->info[recInfo_delKeys],	
+			   &rec->size[recInfo_delKeys]);
 
     xfree (rec->info[recInfo_sortKeys]);
+#if NATTR
+    zebra_rec_keys_get_buf(zh->reg->sortKeys,
+			   &rec->info[recInfo_sortKeys],
+			   &rec->size[recInfo_sortKeys]);
+#else
     rec->size[recInfo_sortKeys] = zh->reg->sortKeys.buf_used;
     rec->info[recInfo_sortKeys] = zh->reg->sortKeys.buf;
     zh->reg->sortKeys.buf = NULL;
     zh->reg->sortKeys.buf_max = 0;
+#endif
 
     return 0;
 }
 
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
-                              int cmd, struct recKeys *reckeys)
+                              int cmd,
+			      zebra_rec_keys_t reckeys,
+			      zint staticrank)
 {
-    void *decode_handle = iscz1_start();
-    int off = 0;
-    int ch = 0;
     ZebraExplainInfo zei = zh->reg->zei;
 
     if (!zh->reg->key_buf)
@@ -1249,49 +1316,63 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
     }
     zebraExplain_recordCountIncrement (zei, cmd ? 1 : -1);
 
-    while (off < reckeys->buf_used)
+    if (zebra_rec_keys_rewind(reckeys))
     {
-        const char *src = reckeys->buf + off;
-        struct it_key key;
-	char *dst = (char*) &key;
-
-	iscz1_decode(decode_handle, &dst, &src);
-	assert(key.len == 4);
-
-        if (zh->reg->key_buf_used + 1024 > 
-            (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
-            extract_flushWriteKeys (zh,0);
-        ++(zh->reg->ptr_i);
-        assert(zh->reg->ptr_i > 0);
-        (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 */
+	size_t slen;
+	const char *str;
+	struct it_key key_in;
+	while(zebra_rec_keys_read(reckeys, &str, &slen, &key_in))
+	{
+	    int ch = 0;
+	    struct it_key key_out;
+	    zint *keyp = key_out.mem;
 
-	zh->reg->key_buf_used +=
-	    key_SU_encode (ch,((char*)zh->reg->key_buf) +
-                           zh->reg->key_buf_used);
-        while (*src)
-            ((char*)zh->reg->key_buf) [(zh->reg->key_buf_used)++] = *src++;
-        src++;
-        ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = '\0';
-        ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = cmd;
+	    assert(key_in.len == 4);
+	    
+	    /* check for buffer overflow */
+	    if (zh->reg->key_buf_used + 1024 > 
+		(zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
+		extract_flushWriteKeys (zh, 0);
+	    
+	    ++(zh->reg->ptr_i);
+	    assert(zh->reg->ptr_i > 0);
+	    (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =
+		(char*)zh->reg->key_buf + zh->reg->key_buf_used;
+
+	    /* encode the ordinal value (field/use/attribute) .. */
+	    ch = (int) key_in.mem[0];
+	    zh->reg->key_buf_used +=
+		key_SU_encode(ch, (char*)zh->reg->key_buf +
+			      zh->reg->key_buf_used);
+	    
+	    /* copy the 0-terminated stuff from str to output */
+	    memcpy((char*)zh->reg->key_buf + zh->reg->key_buf_used, str, slen);
+	    zh->reg->key_buf_used += slen;
+	    ((char*)zh->reg->key_buf)[(zh->reg->key_buf_used)++] = '\0';
 
-        key.len = 3;
-	if (key.mem[1]) /* filter specified record ID */
-	    key.mem[0] = key.mem[1];
-	else
-	    key.mem[0] = sysno;
-	key.mem[1] = key.mem[2];  /* section_id */
-	key.mem[2] = key.mem[3];  /* sequence .. */
+	    /* the delete/insert indicator */
+	    ((char*)zh->reg->key_buf)[(zh->reg->key_buf_used)++] = cmd;
 
-        memcpy ((char*)zh->reg->key_buf + zh->reg->key_buf_used,
-		&key, sizeof(key));
-        (zh->reg->key_buf_used) += sizeof(key);
-        off = src - reckeys->buf;
+	    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
+		*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_out, sizeof(key_out));
+	    (zh->reg->key_buf_used) += sizeof(key_out);
+	}
     }
-    assert (off == reckeys->buf_used);
-    iscz1_stop(decode_handle);
 }
 
 void extract_flushWriteKeys (ZebraHandle zh, int final)
@@ -1428,31 +1509,66 @@ void extract_flushWriteKeys (ZebraHandle zh, int final)
     zh->reg->key_buf_used = 0;
 }
 
-void extract_add_it_key (ZebraHandle zh,
-			 int reg_type,
-			 const char *str, int slen, struct it_key *key)
+ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh,
+				  zebra_rec_keys_t reckeys,
+				  zebra_snippets *snippets)
 {
-    char *dst;
-    struct recKeys *keys = &zh->reg->keys;
-    const char *src = (char*) key;
-    
-    if (keys->buf_used+1024 > keys->buf_max)
+    NMEM nmem = nmem_create();
+    if (zebra_rec_keys_rewind(reckeys)) 
     {
-        char *b = (char *) xmalloc (keys->buf_max += 128000);
-        if (keys->buf_used > 0)
-            memcpy (b, keys->buf, keys->buf_used);
-        xfree (keys->buf);
-        keys->buf = b;
+	const char *str;
+	size_t slen;
+	struct it_key key;
+	while (zebra_rec_keys_read(reckeys, &str, &slen, &key))
+	{
+	    char dst_buf[IT_MAX_WORD];
+	    char *dst_term = dst_buf;
+	    int ord, seqno;
+	    int index_type;
+	    assert(key.len <= 4 && key.len > 2);
+	    seqno = (int) key.mem[key.len-1];
+	    ord = key.mem[0];
+	    
+	    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, str);
+	    zebra_snippets_append(snippets, seqno, ord, dst_term);
+	    nmem_reset(nmem);
+	}
     }
-    dst = keys->buf + keys->buf_used;
-
-    iscz1_encode(keys->codec_handle, &dst, &src);
+    nmem_destroy(nmem);
+    return ZEBRA_OK;
+}
 
-    *dst++ = reg_type;
-    memcpy (dst, str, slen);
-    dst += slen;
-    *dst++ = '\0';
-    keys->buf_used = dst - keys->buf;
+void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys)
+{
+    yaz_log(YLOG_LOG, "print_rec_keys");
+    if (zebra_rec_keys_rewind(reckeys))
+    {
+	const char *str;
+	size_t slen;
+	struct it_key key;
+	while (zebra_rec_keys_read(reckeys, &str, &slen, &key))
+	{
+	    char dst_buf[IT_MAX_WORD];
+	    int seqno;
+	    int index_type;
+	    const char *db = 0;
+	    assert(key.len <= 4 && key.len > 2);
+
+	    zebraExplain_lookup_ord(zh->reg->zei,
+				    key.mem[0], &index_type, &db, 0, 0);
+	    
+	    seqno = (int) key.mem[key.len-1];
+	    
+	    zebra_term_untrans(zh, index_type, dst_buf, str);
+	    
+	    yaz_log(YLOG_LOG, "ord=" ZINT_FORMAT " seqno=%d term=%s",
+		    key.mem[0], seqno, dst_buf); 
+	}
+    }
 }
 
 void extract_add_index_string (RecWord *p, const char *str, int length)
@@ -1463,17 +1579,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;
@@ -1482,18 +1604,54 @@ void extract_add_index_string (RecWord *p, const char *str, int length)
     key.mem[3] = p->seqno;
 
 #if 0
-    /* just for debugging .. */
-    yaz_log(YLOG_LOG, "add: set=%d use=%d "
-	    "record_id=%lld section_id=%lld seqno=%lld",
-	    p->attrSet, p->attrUse, p->record_id, p->section_id, p->seqno);
+    if (1)
+    {
+	char strz[80];
+	int i;
+
+	strz[0] = 0;
+	for (i = 0; i<length && i < 20; i++)
+	    sprintf(strz+strlen(strz), "%02X", str[i] & 0xff);
+	/* just for debugging .. */
+	yaz_log(YLOG_LOG, "add: set=%d use=%d "
+		"record_id=%lld section_id=%lld seqno=%lld %s",
+		p->attrSet, p->attrUse, p->record_id, p->section_id, p->seqno,
+		strz);
+    }
 #endif
 
-    extract_add_it_key(p->extractCtrl->handle,  p->reg_type, str,
-		       length, &key);
+    zebra_rec_keys_write(zh->reg->keys, 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;
+
+    zebra_rec_keys_write(zh->reg->sortKeys, 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;
@@ -1503,9 +1661,9 @@ static void extract_add_sort_string (RecWord *p, const char *str,
     {
         int set, use, slen;
 
-        off += key_SU_decode(&set, sk->buf + off);
-        off += key_SU_decode(&use, sk->buf + off);
-        off += key_SU_decode(&slen, sk->buf + off);
+        off += key_SU_decode(&set, (unsigned char *) sk->buf + off);
+        off += key_SU_decode(&use, (unsigned char *) sk->buf + off);
+        off += key_SU_decode(&slen, (unsigned char *) sk->buf + off);
         off += slen;
         if (p->attrSet == set && p->attrUse == use)
             return;
@@ -1528,11 +1686,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);
@@ -1547,7 +1706,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)
     {
@@ -1559,7 +1718,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;
 	}
@@ -1574,7 +1734,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;
 	}
@@ -1596,7 +1756,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)
     {
@@ -1607,7 +1767,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;
@@ -1636,7 +1796,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
@@ -1657,24 +1817,85 @@ 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);
 }
 
+static void extract_set_store_data_cb(struct recExtractCtrl *p,
+				      void *buf, size_t sz)
+{
+    ZebraHandle zh = (ZebraHandle) p->handle;
+
+    xfree(zh->store_data_buf);
+    zh->store_data_buf = 0;
+    zh->store_data_size = 0;
+    if (buf && sz)
+    {
+	zh->store_data_buf = xmalloc(sz);
+	zh->store_data_size = sz;
+	memcpy(zh->store_data_buf, buf, sz);
+    }
+}
+
+static void extract_set_store_data_prepare(struct recExtractCtrl *p)
+{
+    ZebraHandle zh = (ZebraHandle) p->handle;
+    xfree(zh->store_data_buf);
+    zh->store_data_buf = 0;
+    zh->store_data_size = 0;
+    p->setStoreData = extract_set_store_data_cb;
+}
+
 void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
 {
-    ZebraHandle zh = (ZebraHandle) (p->handle);
+    ZebraHandle zh = (ZebraHandle) p->handle;
     zebraExplain_addSchema (zh->reg->zei, oid);
 }
 
+#if NATTR
+#error not done yet with zebra_rec_keys_t
+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)
 {
@@ -1687,9 +1908,9 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
     {
         int set, use, slen;
         
-        off += key_SU_decode(&set, sk->buf + off);
-        off += key_SU_decode(&use, sk->buf + off);
-        off += key_SU_decode(&slen, sk->buf + off);
+        off += key_SU_decode(&set, (unsigned char *) sk->buf + off);
+        off += key_SU_decode(&use, (unsigned char *) sk->buf + off);
+        off += key_SU_decode(&slen, (unsigned char *) sk->buf + off);
         
         sortIdx_type(sortIdx, use);
         if (cmd == 1)
@@ -1699,6 +1920,7 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
         off += slen;
     }
 }
+#endif
 
 void encode_key_init (struct encode_info *i)
 {