X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=d5359019a4acf436cb3c8f621f2c55b8882efa16;hb=3aa36f2aff049abbb012fab528183a189c06663f;hp=a14b7f50f4724fb781a5cfe248b8bf769ec669f0;hpb=d57bb162b65a585e0ed3ad319d9673d66bc6d90c;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index a14b7f5..d535901 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,10 +1,26 @@
-/*
- * Copyright (C) 1994-2002, Index Data 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: extract.c,v 1.119 2002-05-07 11:05:19 adam Exp $
- */
+/* $Id: extract.c,v 1.150 2004-01-22 16:23:23 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdio.h>
 #include <assert.h>
 #ifdef WIN32
@@ -24,6 +40,9 @@
 #define PRINTF_OFF_T "%ld"
 #endif
 
+#define USE_SHELLSORT 0
+
+#if USE_SHELLSORT
 static void shellsort(void *ar, int r, size_t s,
                       int (*cmp)(const void *a, const void *b))
 {
@@ -46,7 +65,7 @@ static void shellsort(void *ar, int r, size_t s,
             memcpy (a+s*j, v, s);
         } 
 }
-
+#endif
 
 static void logRecord (ZebraHandle zh)
 {
@@ -240,7 +259,7 @@ static void file_end (void *handle, off_t offset)
 }
 
 static char *fileMatchStr (ZebraHandle zh,
-                           struct recKeys *reckeys, struct recordGroup *rGroup,
+                           struct recKeys *reckeys,
                            const char *fname, const char *spec)
 {
     static char dstBuf[2048];      /* static here ??? */
@@ -299,7 +318,7 @@ static char *fileMatchStr (ZebraHandle zh,
             else
             {
                 logf (LOG_WARN, "Missing ) in match criteria %s in group %s",
-                      spec, rGroup->groupName ? rGroup->groupName : "none");
+                      spec, zh->m_group ? zh->m_group : "none");
                 return NULL;
             }
             s++;
@@ -339,13 +358,14 @@ static char *fileMatchStr (ZebraHandle zh,
             s = s1;
 
             if (!strcmp (special, "group"))
-                spec_src = rGroup->groupName;
+                spec_src = zh->m_group;
             else if (!strcmp (special, "database"))
-                spec_src = rGroup->databaseName;
-            else if (!strcmp (special, "filename"))
+                spec_src = zh->basenames[0];
+            else if (!strcmp (special, "filename")) {
                 spec_src = fname;
+	    }
             else if (!strcmp (special, "type"))
-                spec_src = rGroup->recordType;
+                spec_src = zh->m_record_type;
             else 
                 spec_src = NULL;
             if (spec_src)
@@ -374,7 +394,7 @@ static char *fileMatchStr (ZebraHandle zh,
         else
         {
             logf (LOG_WARN, "Syntax error in match criteria %s in group %s",
-                  spec, rGroup->groupName ? rGroup->groupName : "none");
+                  spec, zh->m_group ? zh->m_group : "none");
             return NULL;
         }
         *dst++ = 1;
@@ -382,7 +402,7 @@ static char *fileMatchStr (ZebraHandle zh,
     if (dst == dstBuf)
     {
         logf (LOG_WARN, "No match criteria for record %s in group %s",
-              fname, rGroup->groupName ? rGroup->groupName : "none");
+              fname, zh->m_group ? zh->m_group : "none");
         return NULL;
     }
     *dst = '\0';
@@ -395,32 +415,37 @@ struct recordLogInfo {
     struct recordGroup *rGroup;
 };
      
-static void recordLogPreamble (int level, const char *msg, void *info)
-{
-    struct recordLogInfo *p = (struct recordLogInfo *) info;
-    FILE *outf = yaz_log_file ();
-
-    if (level & LOG_LOG)
-        return ;
-    fprintf (outf, "File %s, offset %d, type %s\n",
-             p->rGroup->recordType, p->recordOffset, p->fname);
-    log_event_start (NULL, NULL);
-}
-
-
-static int recordExtract (ZebraHandle zh,
-                          SYSNO *sysno, const char *fname,
-                          struct recordGroup *rGroup, int deleteFlag,
-                          struct file_read_info *fi,
-			  RecType recType, char *subType, void *clientData)
+static int file_extract_record(ZebraHandle zh,
+			       SYSNO *sysno, const char *fname,
+			       int deleteFlag,
+			       struct file_read_info *fi,
+			       int force_update)
 {
     RecordAttr *recordAttr;
     int r;
-    char *matchStr;
+    const char *matchStr;
     SYSNO sysnotmp;
     Record rec;
-    struct recordLogInfo logInfo;
     off_t recordOffset = 0;
+    RecType recType;
+    void *clientData;
+    char subType[128];
+    
+    if (!(recType =
+	  recType_byName (zh->reg->recTypes, zh->m_record_type, subType,
+			  &clientData)))
+    {
+        logf (LOG_WARN, "No such record type: %s", zh->m_record_type);
+        return 0;
+    }
+
+    /* announce database */
+    if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
+    {
+        if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0],
+				      zh->m_explain_database))
+	    return 0;
+    }
 
     if (fi->fd != -1)
     {
@@ -433,7 +458,7 @@ static int recordExtract (ZebraHandle zh,
 	zh->reg->keys.prevAttrUse = -1;
 	zh->reg->keys.prevAttrSet = -1;
 	zh->reg->keys.prevSeqNo = 0;
-	zh->reg->sortKeys = 0;
+	zh->reg->sortKeys.buf_used = 0;
 	
 	recordOffset = fi->file_moffset;
 	extractCtrl.offset = fi->file_moffset;
@@ -456,29 +481,41 @@ static int recordExtract (ZebraHandle zh,
 		extractCtrl.seqno[i] = 0;
 	}
 	extractCtrl.zebra_maps = zh->reg->zebra_maps;
-	extractCtrl.flagShowRecords = !rGroup->flagRw;
+	extractCtrl.flagShowRecords = !zh->m_flag_rw;
 
-        if (!rGroup->flagRw)
+        if (!zh->m_flag_rw)
             printf ("File: %s " PRINTF_OFF_T "\n", fname, recordOffset);
-
-        logInfo.fname = fname;
-        logInfo.recordOffset = recordOffset;
-        logInfo.rGroup = rGroup;
-        log_event_start (recordLogPreamble, &logInfo);
+        if (zh->m_flag_rw)
+        {
+            char msg[512];
+            sprintf (msg, "%s:" PRINTF_OFF_T , fname, recordOffset);
+            yaz_log_init_prefix2 (msg);
+        }
 
         r = (*recType->extract)(clientData, &extractCtrl);
 
-        log_event_start (NULL, NULL);
-
+        yaz_log_init_prefix2 (0);
 	if (r == RECCTRL_EXTRACT_EOF)
 	    return 0;
-	else if (r == RECCTRL_EXTRACT_ERROR)
+	else if (r == RECCTRL_EXTRACT_ERROR_GENERIC)
+	{
+            /* error occured during extraction ... */
+            if (zh->m_flag_rw &&
+		zh->records_processed < zh->m_file_verbose_limit)
+            {
+                logf (LOG_WARN, "fail %s %s " PRINTF_OFF_T, zh->m_record_type,
+                      fname, recordOffset);
+            }
+            return 0;
+        }
+	else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER)
 	{
             /* error occured during extraction ... */
-            if (rGroup->flagRw &&
-		zh->records_processed < rGroup->fileVerboseLimit)
+            if (zh->m_flag_rw &&
+		zh->records_processed < zh->m_file_verbose_limit)
             {
-                logf (LOG_WARN, "fail %s %s " PRINTF_OFF_T, rGroup->recordType,
+                logf (LOG_WARN, "no filter for %s %s " 
+                      PRINTF_OFF_T, zh->m_record_type,
                       fname, recordOffset);
             }
             return 0;
@@ -487,10 +524,10 @@ static int recordExtract (ZebraHandle zh,
         {
             /* the extraction process returned no information - the record
                is probably empty - unless flagShowRecords is in use */
-            if (!rGroup->flagRw)
+            if (!zh->m_flag_rw)
                 return 1;
 	    
-	    logf (LOG_WARN, "empty %s %s " PRINTF_OFF_T, rGroup->recordType,
+	    logf (LOG_WARN, "empty %s %s " PRINTF_OFF_T, zh->m_record_type,
 		  fname, recordOffset);
             return 1;
         }
@@ -503,12 +540,12 @@ static int recordExtract (ZebraHandle zh,
     {
         sysnotmp = 0;
         sysno = &sysnotmp;
-        if (rGroup->recordId && *rGroup->recordId)
+        if (zh->m_record_id && *zh->m_record_id)
         {
             char *rinfo;
         
-            matchStr = fileMatchStr (zh, &zh->reg->keys, rGroup, fname, 
-                                     rGroup->recordId);
+            matchStr = fileMatchStr (zh, &zh->reg->keys, fname, 
+				     zh->m_record_id);
             if (matchStr)
             {
                 rinfo = dict_lookup (zh->reg->matchDict, matchStr);
@@ -528,13 +565,13 @@ static int recordExtract (ZebraHandle zh,
         /* new record */
         if (deleteFlag)
         {
-	    logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T, rGroup->recordType,
+	    logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T, zh->m_record_type,
 		  fname, recordOffset);
             logf (LOG_WARN, "cannot delete record above (seems new)");
             return 1;
         }
-        if (zh->records_processed < rGroup->fileVerboseLimit)
-            logf (LOG_LOG, "add %s %s " PRINTF_OFF_T, rGroup->recordType,
+        if (zh->records_processed < zh->m_file_verbose_limit)
+            logf (LOG_LOG, "add %s %s " PRINTF_OFF_T, zh->m_record_type,
                   fname, recordOffset);
         rec = rec_new (zh->reg->records);
 
@@ -546,8 +583,8 @@ static int recordExtract (ZebraHandle zh,
         {
             dict_insert (zh->reg->matchDict, matchStr, sizeof(*sysno), sysno);
         }
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
+        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
 
         zh->records_inserted++;
     }
@@ -555,18 +592,19 @@ static int recordExtract (ZebraHandle zh,
     {
         /* record already exists */
         struct recKeys delkeys;
+        struct sortKeys sortKeys;
 
         rec = rec_get (zh->reg->records, *sysno);
         assert (rec);
 	
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
 
-	if (recordAttr->runNumber ==
+	if (!force_update && recordAttr->runNumber ==
             zebraExplain_runNumberIncrement (zh->reg->zei, 0))
 	{
             yaz_log (LOG_LOG, "run number = %d", recordAttr->runNumber);
 	    yaz_log (LOG_LOG, "skipped %s %s " PRINTF_OFF_T,
-                     rGroup->recordType, fname, recordOffset);
+                     zh->m_record_type, fname, recordOffset);
 	    extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
 	    rec_rm (&rec);
 	    logRecord (zh);
@@ -574,7 +612,11 @@ static int recordExtract (ZebraHandle zh,
 	}
         delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
-	extract_flushSortKeys (zh, *sysno, 0, &zh->reg->sortKeys);
+
+        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);
         if (deleteFlag)
         {
@@ -582,14 +624,14 @@ static int recordExtract (ZebraHandle zh,
             if (!delkeys.buf_used)
             {
                 logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T,
-                      rGroup->recordType, fname, recordOffset);
+                      zh->m_record_type, fname, recordOffset);
                 logf (LOG_WARN, "cannot delete file above, storeKeys false");
             }
             else
             {
-                if (zh->records_processed < rGroup->fileVerboseLimit)
+                if (zh->records_processed < zh->m_file_verbose_limit)
                     logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T,
-                         rGroup->recordType, fname, recordOffset);
+                         zh->m_record_type, fname, recordOffset);
                 zh->records_deleted++;
                 if (matchStr)
                     dict_delete (zh->reg->matchDict, matchStr);
@@ -605,14 +647,15 @@ static int recordExtract (ZebraHandle zh,
             if (!delkeys.buf_used)
             {
                 logf (LOG_LOG, "update %s %s " PRINTF_OFF_T,
-                      rGroup->recordType, fname, recordOffset);
+                      zh->m_record_type, fname, recordOffset);
                 logf (LOG_WARN, "cannot update file above, storeKeys false");
             }
             else
             {
-                if (zh->records_processed < rGroup->fileVerboseLimit)
+                if (zh->records_processed < zh->m_file_verbose_limit)
                     logf (LOG_LOG, "update %s %s " PRINTF_OFF_T,
-                        rGroup->recordType, fname, recordOffset);
+                        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++;
             }
@@ -621,7 +664,7 @@ static int recordExtract (ZebraHandle zh,
     /* update file type */
     xfree (rec->info[recInfo_fileType]);
     rec->info[recInfo_fileType] =
-        rec_strdup (rGroup->recordType, &rec->size[recInfo_fileType]);
+        rec_strdup (zh->m_record_type, &rec->size[recInfo_fileType]);
 
     /* update filename */
     xfree (rec->info[recInfo_filename]);
@@ -630,19 +673,12 @@ static int recordExtract (ZebraHandle zh,
 
     /* update delete keys */
     xfree (rec->info[recInfo_delKeys]);
-    if (zh->reg->keys.buf_used > 0 && rGroup->flagStoreKeys == 1)
+    if (zh->reg->keys.buf_used > 0 && zh->m_store_keys == 1)
     {
-#if 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;
-#else
-        rec->info[recInfo_delKeys] = xmalloc (reckeys.buf_used);
-        rec->size[recInfo_delKeys] = reckeys.buf_used;
-        memcpy (rec->info[recInfo_delKeys], reckeys.buf,
-                rec->size[recInfo_delKeys]);
-#endif
     }
     else
     {
@@ -650,6 +686,14 @@ static int recordExtract (ZebraHandle zh,
         rec->size[recInfo_delKeys] = 0;
     }
 
+    /* update sort keys */
+    xfree (rec->info[recInfo_sortKeys]);
+
+    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;
+
     /* save file size of original record */
     zebraExplain_recordBytesIncrement (zh->reg->zei,
                                        - recordAttr->recordSize);
@@ -665,7 +709,7 @@ static int recordExtract (ZebraHandle zh,
 
     /* update store data */
     xfree (rec->info[recInfo_storeData]);
-    if (rGroup->flagStoreData == 1)
+    if (zh->m_store_data)
     {
         rec->size[recInfo_storeData] = recordAttr->recordSize;
         rec->info[recInfo_storeData] = (char *)
@@ -692,7 +736,7 @@ static int recordExtract (ZebraHandle zh,
     /* update database name */
     xfree (rec->info[recInfo_databaseName]);
     rec->info[recInfo_databaseName] =
-        rec_strdup (rGroup->databaseName, &rec->size[recInfo_databaseName]); 
+        rec_strdup (zh->basenames[0], &rec->size[recInfo_databaseName]); 
 
     /* update offset */
     recordAttr->recordOffset = recordOffset;
@@ -704,26 +748,19 @@ static int recordExtract (ZebraHandle zh,
 }
 
 int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, 
-                 const struct recordGroup *rGroupP, int deleteFlag)
+		 int deleteFlag)
 {
     int r, i, fd;
     char gprefix[128];
     char ext[128];
     char ext_res[128];
-    char subType[128];
-    RecType recType;
-    struct recordGroup rGroupM;
-    struct recordGroup *rGroup = &rGroupM;
     struct file_read_info *fi;
-    void *clientData;
 
-    memcpy (rGroup, rGroupP, sizeof(*rGroupP));
-   
-    if (!rGroup->groupName || !*rGroup->groupName)
+    if (!zh->m_group || !*zh->m_group)
         *gprefix = '\0';
     else
-        sprintf (gprefix, "%s.", rGroup->groupName);
-
+        sprintf (gprefix, "%s.", zh->m_group);
+    
     logf (LOG_DEBUG, "fileExtract %s", fname);
 
     /* determine file extension */
@@ -737,99 +774,24 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
             break;
         }
     /* determine file type - depending on extension */
-    if (!rGroup->recordType)
+    if (!zh->m_record_type)
     {
         sprintf (ext_res, "%srecordType.%s", gprefix, ext);
-        if (!(rGroup->recordType = res_get (zh->res, ext_res)))
-        {
-            sprintf (ext_res, "%srecordType", gprefix);
-            rGroup->recordType = res_get (zh->res, ext_res);
-        }
+        zh->m_record_type = res_get (zh->res, ext_res);
     }
-    if (!rGroup->recordType)
+    if (!zh->m_record_type)
     {
-        if (zh->records_processed < rGroup->fileVerboseLimit)
+	if (zh->records_processed < zh->m_file_verbose_limit)
             logf (LOG_LOG, "? %s", fname);
         return 0;
     }
-    if (!*rGroup->recordType)
-	return 0;
-    if (!(recType =
-	  recType_byName (zh->reg->recTypes, rGroup->recordType, subType,
-			  &clientData)))
-    {
-        logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
-        return 0;
-    }
-
     /* determine match criteria */
-    if (!rGroup->recordId)
+    if (!zh->m_record_id)
     {
         sprintf (ext_res, "%srecordId.%s", gprefix, ext);
-        rGroup->recordId = res_get (zh->res, ext_res);
-    }
-
-    /* determine database name */
-    if (!rGroup->databaseName)
-    {
-        sprintf (ext_res, "%sdatabase.%s", gprefix, ext);
-        if (!(rGroup->databaseName = res_get (zh->res, ext_res)))
-        {
-            sprintf (ext_res, "%sdatabase", gprefix);
-            rGroup->databaseName = res_get (zh->res, ext_res);
-        }
-    }
-    if (!rGroup->databaseName)
-        rGroup->databaseName = "Default";
-
-    /* determine if explain database */
-    
-    sprintf (ext_res, "%sexplainDatabase", gprefix);
-    rGroup->explainDatabase =
-	atoi (res_get_def (zh->res, ext_res, "0"));
-
-    /* announce database */
-    if (zebraExplain_curDatabase (zh->reg->zei, rGroup->databaseName))
-    {
-        if (zebraExplain_newDatabase (zh->reg->zei, rGroup->databaseName,
-				      rGroup->explainDatabase))
-	    return 0;
+        zh->m_record_id = res_get (zh->res, ext_res);
     }
 
-    if (rGroup->flagStoreData == -1)
-    {
-        const char *sval;
-        sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
-        if (!(sval = res_get (zh->res, ext_res)))
-        {
-            sprintf (ext_res, "%sstoreData", gprefix);
-            sval = res_get (zh->res, ext_res);
-        }
-        if (sval)
-            rGroup->flagStoreData = atoi (sval);
-    }
-    if (rGroup->flagStoreData == -1)
-        rGroup->flagStoreData = 0;
-
-    if (rGroup->flagStoreKeys == -1)
-    {
-        const char *sval;
-
-        sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
-        sval = res_get (zh->res, ext_res);
-	if (!sval)
-        {
-            sprintf (ext_res, "%sstoreKeys", gprefix);
-            sval = res_get (zh->res, ext_res);
-        }
-	if (!sval)
-	    sval = res_get (zh->res, "storeKeys");
-        if (sval)
-            rGroup->flagStoreKeys = atoi (sval);
-    }
-    if (rGroup->flagStoreKeys == -1)
-        rGroup->flagStoreKeys = 0;
-
     if (sysno && deleteFlag)
         fd = -1;
     else
@@ -856,8 +818,7 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
     do
     {
         file_begin (fi);
-        r = recordExtract (zh, sysno, fname, rGroup, deleteFlag, fi,
-                           recType, subType, clientData);
+        r = file_extract_record (zh, sysno, fname, deleteFlag, fi, 1);
     } while (r && !sysno && fi->file_more);
     file_read_stop (fi);
     if (fd != -1)
@@ -865,25 +826,37 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
     return r;
 }
 
-
-int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
-                        const char *buf, size_t buf_size,
-                        const char *databaseName, int delete_flag,
-                        int test_mode, int *sysno,
-                        int store_keys, int store_data,
-                        const char *match_criteria)
+/*
+  If sysno is provided, then it's used to identify the reocord.
+  If not, and match_criteria is provided, then sysno is guessed
+  If not, and a record is provided, then sysno is got from there
+  
+ */
+int buffer_extract_record (ZebraHandle zh, 
+			   const char *buf, size_t buf_size,
+			   int delete_flag,
+			   int test_mode, 
+			   const char *recordType,
+			   int *sysno,
+			   const char *match_criteria,
+			   const char *fname,
+			   int force_update,
+			   int allow_update)
 {
     RecordAttr *recordAttr;
     struct recExtractCtrl extractCtrl;
     int i, r;
-    char *matchStr = 0;
-    RecType recType;
+    const char *matchStr = 0;
+    RecType recType = NULL;
     char subType[1024];
     void *clientData;
-    const char *fname = "<no file>";
     Record rec;
     long recordOffset = 0;
     struct zebra_fetch_control fc;
+    const char *pr_fname = fname;  /* filename to print .. */
+
+    if (!pr_fname)
+	pr_fname = "<no file>";  /* make it printable if file is omitted */
 
     fc.fd = -1;
     fc.record_int_buf = buf;
@@ -899,26 +872,39 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
     extractCtrl.endf = zebra_record_int_end;
     extractCtrl.fh = &fc;
 
-    /* announce database */
-    if (zebraExplain_curDatabase (zh->reg->zei, databaseName))
-    {
-        if (zebraExplain_newDatabase (zh->reg->zei, databaseName, 0))
-	    return 0;
-    }
-    if (!(recType =
-	  recType_byName (zh->reg->recTypes, recordType, subType,
-			  &clientData)))
-    {
-        logf (LOG_WARN, "No such record type: %s", recordType);
-        return 0;
-    }
-
     zh->reg->keys.buf_used = 0;
     zh->reg->keys.prevAttrUse = -1;
     zh->reg->keys.prevAttrSet = -1;
     zh->reg->keys.prevSeqNo = 0;
-    zh->reg->sortKeys = 0;
+    zh->reg->sortKeys.buf_used = 0;
 
+    if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
+    {
+        if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0], 
+				      zh->m_explain_database))
+            return 0;
+    }
+    
+    if (recordType && *recordType) {
+        logf (LOG_DEBUG, "Record type explicitly specified: %s", recordType);
+        recType = recType_byName (zh->reg->recTypes, recordType, subType,
+                                  &clientData);
+    } else {
+        if (!(zh->m_record_type)) {
+            logf (LOG_WARN, "No such record type defined");
+            return 0;
+        }
+        logf (LOG_DEBUG, "Get record type from rgroup: %s",zh->m_record_type);
+        recType = recType_byName (zh->reg->recTypes, zh->m_record_type, subType,
+                                  &clientData);
+        recordType = zh->m_record_type;
+    }
+    
+    if (!recType) {
+        logf (LOG_WARN, "No such record type: %s", zh->m_record_type);
+        return 0;
+    }
+    
     extractCtrl.subType = subType;
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;
@@ -939,19 +925,16 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
 
     if (r == RECCTRL_EXTRACT_EOF)
 	return 0;
-    else if (r == RECCTRL_EXTRACT_ERROR)
+    else if (r == RECCTRL_EXTRACT_ERROR_GENERIC)
     {
 	/* error occured during extraction ... */
-#if 1
-	yaz_log (LOG_WARN, "extract error");
-#else
-	if (rGroup->flagRw &&
-	    zh->records_processed < rGroup->fileVerboseLimit)
-	{
-	    logf (LOG_WARN, "fail %s %s %ld", rGroup->recordType,
-		  fname, (long) recordOffset);
-	}
-#endif
+	yaz_log (LOG_WARN, "extract error: generic");
+	return 0;
+    }
+    else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER)
+    {
+	/* error occured during extraction ... */
+	yaz_log (LOG_WARN, "extract error: no such filter");
 	return 0;
     }
     if (zh->reg->keys.buf_used == 0)
@@ -965,6 +948,29 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
 	return 1;
     }
     /* match criteria */
+    matchStr = NULL;
+
+    if (! *sysno) {
+        char *rinfo;
+        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, 
+                                         zh->m_record_id);
+		if (!matchStr)
+                {
+                    logf (LOG_WARN, "Bad match criteria (recordID)");
+		    return 1;
+                }
+            }
+        }
+        if (matchStr) {
+            rinfo = dict_lookup (zh->reg->matchDict, matchStr);
+            if (rinfo)
+                memcpy (sysno, rinfo+1, sizeof(*sysno));
+        }
+    }
 
     if (! *sysno)
     {
@@ -972,11 +978,11 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
         if (delete_flag)
         {
 	    logf (LOG_LOG, "delete %s %s %ld", recordType,
-		  fname, (long) recordOffset);
+		  pr_fname, (long) recordOffset);
             logf (LOG_WARN, "cannot delete record above (seems new)");
             return 1;
         }
-	logf (LOG_LOG, "add %s %s %ld", recordType, fname,
+	logf (LOG_LOG, "add %s %s %ld", recordType, pr_fname,
 	      (long) recordOffset);
         rec = rec_new (zh->reg->records);
 
@@ -989,30 +995,49 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
             dict_insert (zh->reg->matchDict, matchStr,
                          sizeof(*sysno), sysno);
         }
-        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
 	extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-    }
+        extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+
+        zh->records_inserted++;
+    } 
     else
     {
         /* record already exists */
         struct recKeys delkeys;
+        struct sortKeys sortKeys;
+
+	if (!allow_update) {
+	      logf (LOG_LOG, "skipped %s %s %ld", 
+		    recordType, pr_fname, (long) recordOffset);
+	      logRecord(zh);
+	      return -1;
+	}
 
         rec = rec_get (zh->reg->records, *sysno);
         assert (rec);
 	
 	recordAttr = rec_init_attr (zh->reg->zei, rec);
-
-	if (recordAttr->runNumber ==
-	    zebraExplain_runNumberIncrement (zh->reg->zei, 0))
-	{
-	    logf (LOG_LOG, "skipped %s %s %ld", recordType,
-		  fname, (long) recordOffset);
-	    rec_rm (&rec);
-	    return 1;
+	
+	if (!force_update) {
+	    if (recordAttr->runNumber ==
+		zebraExplain_runNumberIncrement (zh->reg->zei, 0))
+	    {
+		logf (LOG_LOG, "skipped %s %s %ld", recordType,
+		      pr_fname, (long) recordOffset);
+		extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
+		rec_rm (&rec);
+		logRecord(zh);
+		return 0;
+	    }
 	}
+
         delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
-	extract_flushSortKeys (zh, *sysno, 0, &zh->reg->sortKeys);
+
+        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);
         if (delete_flag)
         {
@@ -1020,21 +1045,21 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
             if (!delkeys.buf_used)
             {
                 logf (LOG_LOG, "delete %s %s %ld", recordType,
-                      fname, (long) recordOffset);
+                      pr_fname, (long) recordOffset);
                 logf (LOG_WARN, "cannot delete file above, storeKeys false");
             }
             else
             {
 		logf (LOG_LOG, "delete %s %s %ld", recordType,
-		      fname, (long) recordOffset);
-#if 0
+		      pr_fname, (long) recordOffset);
+                zh->records_deleted++;
                 if (matchStr)
-                    dict_delete (matchDict, matchStr);
-#endif
+                    dict_delete (zh->reg->matchDict, matchStr);
                 rec_del (zh->reg->records, &rec);
             }
 	    rec_rm (&rec);
-            return 1;
+            logRecord(zh);
+            return 0;
         }
         else
         {
@@ -1042,14 +1067,16 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
             if (!delkeys.buf_used)
             {
                 logf (LOG_LOG, "update %s %s %ld", recordType,
-                      fname, (long) recordOffset);
+                      pr_fname, (long) recordOffset);
                 logf (LOG_WARN, "cannot update file above, storeKeys false");
             }
             else
             {
 		logf (LOG_LOG, "update %s %s %ld", recordType,
-		      fname, (long) recordOffset);
+		      pr_fname, (long) recordOffset);
+                extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
                 extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+                zh->records_updated++;
             }
         }
     }
@@ -1065,7 +1092,7 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
 
     /* update delete keys */
     xfree (rec->info[recInfo_delKeys]);
-    if (zh->reg->keys.buf_used > 0 && store_keys == 1)
+    if (zh->reg->keys.buf_used > 0 && zh->m_store_keys == 1)
     {
         rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
         rec->info[recInfo_delKeys] = zh->reg->keys.buf;
@@ -1078,6 +1105,14 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
         rec->size[recInfo_delKeys] = 0;
     }
 
+    /* update sort keys */
+    xfree (rec->info[recInfo_sortKeys]);
+
+    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;
+
     /* save file size of original record */
     zebraExplain_recordBytesIncrement (zh->reg->zei,
 				       - recordAttr->recordSize);
@@ -1097,28 +1132,12 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
 
     /* update store data */
     xfree (rec->info[recInfo_storeData]);
-    if (store_data == 1)
+    if (zh->m_store_data)
     {
         rec->size[recInfo_storeData] = recordAttr->recordSize;
         rec->info[recInfo_storeData] = (char *)
 	    xmalloc (recordAttr->recordSize);
-#if 1
         memcpy (rec->info[recInfo_storeData], buf, recordAttr->recordSize);
-#else
-        if (lseek (fi->fd, recordOffset, SEEK_SET) < 0)
-        {
-            logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s",
-                  (long) recordOffset, fname);
-            exit (1);
-        }
-        if (read (fi->fd, rec->info[recInfo_storeData], recordAttr->recordSize)
-	    < recordAttr->recordSize)
-        {
-            logf (LOG_ERRNO|LOG_FATAL, "read %d bytes of %s",
-                  recordAttr->recordSize, fname);
-            exit (1);
-        }
-#endif
     }
     else
     {
@@ -1128,14 +1147,14 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
     /* update database name */
     xfree (rec->info[recInfo_databaseName]);
     rec->info[recInfo_databaseName] =
-        rec_strdup (databaseName, &rec->size[recInfo_databaseName]); 
+        rec_strdup (zh->basenames[0], &rec->size[recInfo_databaseName]); 
 
     /* update offset */
     recordAttr->recordOffset = recordOffset;
     
     /* commit this record */
     rec_put (zh->reg->records, &rec);
-
+    logRecord(zh);
     return 0;
 }
 
@@ -1158,7 +1177,7 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     zh->reg->keys.prevAttrUse = -1;
     zh->reg->keys.prevAttrSet = -1;
     zh->reg->keys.prevSeqNo = 0;
-    zh->reg->sortKeys = 0;
+    zh->reg->sortKeys.buf_used = 0;
     
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;
@@ -1169,17 +1188,22 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     extractCtrl.zebra_maps = zh->reg->zebra_maps;
     extractCtrl.flagShowRecords = 0;
     extractCtrl.handle = handle;
-    
-    grs_extract_tree(&extractCtrl, n);
+
+    if (n)
+	grs_extract_tree(&extractCtrl, n);
 
     if (rec->size[recInfo_delKeys])
     {
 	struct recKeys delkeys;
-	struct sortKey *sortKeys = 0;
+	struct sortKeys sortkeys;
 
 	delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
-	extract_flushSortKeys (zh, rec->sysno, 0, &sortKeys);
+
+	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);
     }
     extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys);
@@ -1190,6 +1214,13 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     rec->info[recInfo_delKeys] = zh->reg->keys.buf;
     zh->reg->keys.buf = NULL;
     zh->reg->keys.buf_max = 0;
+
+    xfree (rec->info[recInfo_sortKeys]);
+    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;
+
     return 0;
 }
 
@@ -1208,7 +1239,14 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
 
     if (!zh->reg->key_buf)
     {
-	int mem = 8*1024*1024;
+	int mem= 1024*1024* atoi( res_get_def( zh->res, "memmax", "8"));
+	if (mem <= 0)
+	{
+	    logf(LOG_WARN, "Invalid memory setting, using default 8 MB");
+	    mem= 1024*1024*8;
+	}
+	/* FIXME: That "8" should be in a default settings include */
+	/* not hard-coded here! -H */
 	zh->reg->key_buf = (char**) xmalloc (mem);
 	zh->reg->ptr_top = mem/sizeof(char*);
 	zh->reg->ptr_i = 0;
@@ -1244,7 +1282,7 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
 #endif
         if (zh->reg->key_buf_used + 1024 > 
             (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
-            extract_flushWriteKeys (zh);
+            extract_flushWriteKeys (zh,0);
         ++(zh->reg->ptr_i);
         (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =
 	    (char*)zh->reg->key_buf + zh->reg->key_buf_used;
@@ -1281,24 +1319,66 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
     assert (off == reckeys->buf_used);
 }
 
-void extract_flushWriteKeys (ZebraHandle zh)
+void extract_flushWriteKeys (ZebraHandle zh, int final)
+        /* optimizing: if final=1, and no files written yet */
+        /* push the keys directly to merge, sidestepping the */
+        /* temp file altogether. Speeds small updates */
 {
     FILE *outf;
     char out_fname[200];
     char *prevcp, *cp;
     struct encode_info encode_info;
     int ptr_i = zh->reg->ptr_i;
+    int temp_policy;
 #if SORT_EXTRA
     int i;
 #endif
     if (!zh->reg->key_buf || ptr_i <= 0)
+    {
+        logf (LOG_DEBUG, "  nothing to flush section=%d buf=%p i=%d",
+               zh->reg->key_file_no, zh->reg->key_buf, ptr_i);
+        logf (LOG_DEBUG, "  buf=%p ",
+               zh->reg->key_buf);
+        logf (LOG_DEBUG, "  ptr=%d ",zh->reg->ptr_i);
+        logf (LOG_DEBUG, "  reg=%p ",zh->reg);
+               
         return;
+    }
 
     (zh->reg->key_file_no)++;
     logf (LOG_LOG, "sorting section %d", (zh->reg->key_file_no));
+    logf (LOG_DEBUG, "  sort_buff at %p n=%d",
+                    zh->reg->key_buf + zh->reg->ptr_top - ptr_i,ptr_i);
 #if !SORT_EXTRA
     qsort (zh->reg->key_buf + zh->reg->ptr_top - ptr_i, ptr_i,
                sizeof(char*), key_qsort_compare);
+
+    /* zebra.cfg: tempfiles: 
+    /* Y: always use temp files (old way) */
+    /* A: use temp files, if more than one (auto) */
+    /*    = if this is both the last and the first */
+    /* N: never bother with temp files (new) */
+
+    temp_policy=toupper(res_get_def(zh->res,"tempfiles","auto")[0]);
+    if (temp_policy != 'Y' && temp_policy != 'N' && temp_policy != 'A') {
+        logf (LOG_WARN, "Illegal tempfiles setting '%c'. using 'Auto' ", 
+                        temp_policy);
+        temp_policy='A';
+    }
+
+    if (   ( temp_policy =='N' )   ||     /* always from memory */
+         ( ( temp_policy =='A' ) &&       /* automatic */
+             (zh->reg->key_file_no == 1) &&  /* this is first time */
+             (final) ) )                     /* and last (=only) time */
+    { /* go directly from memory */
+        zh->reg->key_file_no =0; /* signal not to read files */
+        zebra_index_merge(zh); 
+        zh->reg->ptr_i = 0;
+        zh->reg->key_buf_used = 0; 
+        return; 
+    }
+
+    /* Not doing directly from memory, write into a temp file */
     extract_get_fname_tmp (zh, out_fname, zh->reg->key_file_no);
 
     if (!(outf = fopen (out_fname, "wb")))
@@ -1317,6 +1397,7 @@ void extract_flushWriteKeys (ZebraHandle zh)
         cp = (zh->reg->key_buf)[zh->reg->ptr_top - ptr_i];
         if (strcmp (cp, prevcp))
         {
+            encode_key_flush ( &encode_info, outf);
             encode_key_init (&encode_info);
             encode_key_write (cp, &encode_info, outf);
             prevcp = cp;
@@ -1324,6 +1405,7 @@ void extract_flushWriteKeys (ZebraHandle zh)
         else
             encode_key_write (cp + strlen(cp), &encode_info, outf);
     }
+    encode_key_flush ( &encode_info, outf);
 #else
     qsort (key_buf + ptr_top-ptr_i, ptr_i, sizeof(char*), key_x_compare);
     extract_get_fname_tmp (out_fname, key_file_no);
@@ -1355,6 +1437,7 @@ void extract_flushWriteKeys (ZebraHandle zh)
                 cp = key_buf[ptr_top-ptr_i];
                 encode_key_write (cp+key_y_len, &encode_info, outf);
             }
+            encode_key_flush ( &encode_info, outf);
             if (!i)
                 break;
             prevcp = key_buf[ptr_top-ptr_i];
@@ -1458,23 +1541,38 @@ void extract_add_index_string (RecWord *p, const char *string,
 static void extract_add_sort_string (RecWord *p, const char *string,
 				     int length)
 {
-    struct sortKey *sk;
     ZebraHandle zh = p->extractCtrl->handle;
+    struct sortKeys *sk = &zh->reg->sortKeys;
+    int off = 0;
 
-    for (sk = zh->reg->sortKeys; sk; sk = sk->next)
-	if (sk->attrSet == p->attrSet && sk->attrUse == p->attrUse)
-	    return;
-
-    sk = (struct sortKey *) xmalloc (sizeof(*sk));
-    sk->next = zh->reg->sortKeys;
-    zh->reg->sortKeys = sk;
-
-    sk->string = (char *) xmalloc (length);
-    sk->length = length;
-    memcpy (sk->string, string, length);
-
-    sk->attrSet = p->attrSet;
-    sk->attrUse = p->attrUse;
+    while (off < sk->buf_used)
+    {
+        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 += slen;
+        if (p->attrSet == set && p->attrUse == use)
+            return;
+    }
+    assert (off == sk->buf_used);
+    
+    if (sk->buf_used + IT_MAX_WORD > sk->buf_max)
+    {
+        char *b;
+        
+        b = (char *) xmalloc (sk->buf_max += 128000);
+        if (sk->buf_used > 0)
+            memcpy (b, sk->buf, sk->buf_used);
+        xfree (sk->buf);
+        sk->buf = b;
+    }
+    off += key_SU_encode(p->attrSet, sk->buf + off);
+    off += key_SU_encode(p->attrUse, sk->buf + off);
+    off += key_SU_encode(length, sk->buf + off);
+    memcpy (sk->buf + off, string, length);
+    sk->buf_used = off + length;
 }
 
 void extract_add_string (RecWord *p, const char *string, int length)
@@ -1580,6 +1678,12 @@ static void extract_add_complete_field (RecWord *p)
 void extract_token_add (RecWord *p)
 {
     WRBUF wrbuf;
+#if 0
+    yaz_log (LOG_LOG, "token_add "
+	     "reg_type=%c attrSet=%d attrUse=%d seqno=%d s=%.*s",
+             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,
 			       p->string, p->length)))
     {
@@ -1599,22 +1703,28 @@ void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
 }
 
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, struct sortKey **skp)
+                            int cmd, struct sortKeys *sk)
 {
-    struct sortKey *sk = *skp;
     SortIdx sortIdx = zh->reg->sortIdx;
+    int off = 0;
 
     sortIdx_sysno (sortIdx, sysno);
-    while (sk)
+
+    while (off < sk->buf_used)
     {
-	struct sortKey *sk_next = sk->next;
-	sortIdx_type (sortIdx, sk->attrUse);
-	sortIdx_add (sortIdx, sk->string, sk->length);
-	xfree (sk->string);
-	xfree (sk);
-	sk = sk_next;
+        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);
+        
+        sortIdx_type(sortIdx, use);
+        if (cmd == 1)
+            sortIdx_add(sortIdx, sk->buf + off, slen);
+        else
+            sortIdx_add(sortIdx, "", 1);
+        off += slen;
     }
-    *skp = 0;
 }
 
 void encode_key_init (struct encode_info *i)
@@ -1622,6 +1732,10 @@ void encode_key_init (struct encode_info *i)
     i->sysno = 0;
     i->seqno = 0;
     i->cmd = -1;
+    i->prevsys=0;
+    i->prevseq=0;
+    i->prevcmd=-1;
+    i->keylen=0;
 }
 
 char *encode_key_int (int d, char *bp)
@@ -1648,7 +1762,13 @@ char *encode_key_int (int d, char *bp)
     }
     return bp;
 }
+#define OLDENCODE 1
 
+#ifdef OLDENCODE
+/* this is the old encode_key_write 
+ * may be deleted once we are confident that the new works
+ * HL 15-oct-2002
+ */
 void encode_key_write (char *k, struct encode_info *i, FILE *outf)
 {
     struct it_key key;
@@ -1675,3 +1795,108 @@ void encode_key_write (char *k, struct encode_info *i, FILE *outf)
     }
 }
 
+void encode_key_flush (struct encode_info *i, FILE *outf)
+{ /* dummy routine */
+}
+
+#else
+
+/* new encode_key_write
+ * The idea is to buffer one more key, and compare them
+ * If we are going to delete and insert the same key, 
+ * we may as well not bother. Should make a difference in 
+ * updates with small modifications (appending to a mbox)
+ */
+void encode_key_write (char *k, struct encode_info *i, FILE *outf)
+{
+    struct it_key key;
+    char *bp; 
+
+    if (*k)  /* first time for new key */
+    {
+        bp = i->buf;
+        while ((*bp++ = *k++))
+            ;
+	i->keylen= bp - i->buf -1;    
+	assert(i->keylen+1+sizeof(struct it_key) < ENCODE_BUFLEN);
+    }
+    else
+    {
+	bp=i->buf + i->keylen;
+	*bp++=0;
+	k++;
+    }
+
+    memcpy (&key, k+1, sizeof(struct it_key));
+    if (0==i->prevsys) /* no previous filter, fill up */
+    {
+        i->prevsys=key.sysno;
+	i->prevseq=key.seqno;
+	i->prevcmd=*k;
+    }
+    else if ( (i->prevsys==key.sysno) &&
+              (i->prevseq==key.seqno) &&
+	      (i->prevcmd!=*k) )
+    { /* same numbers, diff cmd, they cancel out */
+        i->prevsys=0;
+    }
+    else 
+    { /* different stuff, write previous, move buf */
+        bp = encode_key_int ( (i->prevsys - i->sysno) * 2 + i->prevcmd, bp);
+	if (i->sysno != i->prevsys)
+	{
+	    i->sysno = i->prevsys;
+	    i->seqno = 0;
+        }
+        else if (!i->seqno && !i->prevseq && i->cmd == i->prevcmd)
+	{
+	    return; /* ??? Filters some sort of duplicates away */
+	            /* ??? Can this ever happen   -H 15oct02 */
+	}
+        bp = encode_key_int (i->prevseq - i->seqno, bp);
+        i->seqno = i->prevseq;
+        i->cmd = i->prevcmd;
+        if (fwrite (i->buf, bp - i->buf, 1, outf) != 1)
+        {
+            logf (LOG_FATAL|LOG_ERRNO, "fwrite");
+            exit (1);
+        }
+        i->keylen=0; /* ok, it's written, forget it */
+	i->prevsys=key.sysno;
+	i->prevseq=key.seqno;
+	i->prevcmd=*k;
+    }
+}
+
+void encode_key_flush (struct encode_info *i, FILE *outf)
+{ /* flush the last key from i */
+    char *bp =i->buf + i->keylen;
+    if (0==i->prevsys)
+    {
+        return; /* nothing to flush */
+    }
+    *bp++=0;
+    bp = encode_key_int ( (i->prevsys - i->sysno) * 2 + i->prevcmd, bp);
+    if (i->sysno != i->prevsys)
+    {
+        i->sysno = i->prevsys;
+        i->seqno = 0;
+    }
+    else if (!i->seqno && !i->prevseq && i->cmd == i->prevcmd)
+    {
+        return; /* ??? Filters some sort of duplicates away */
+                /* ??? Can this ever happen   -H 15oct02 */
+    }
+    bp = encode_key_int (i->prevseq - i->seqno, bp);
+    i->seqno = i->prevseq;
+    i->cmd = i->prevcmd;
+    if (fwrite (i->buf, bp - i->buf, 1, outf) != 1)
+    {
+        logf (LOG_FATAL|LOG_ERRNO, "fwrite");
+        exit (1);
+    }
+    i->keylen=0; /* ok, it's written, forget it */
+    i->prevsys=0; /* forget the values too */
+    i->prevseq=0;
+}
+#endif