X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=7374470903e022c3dde100cc8ba47ddd526facf0;hb=b7942589b21cca1b6d44c7bf9446dcb6a5942953;hp=4978551cdd06b3ea49f40e6cd67d8aa77e77335d;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 4978551..7374470 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.74  1997-09-09 13:38:06  adam
+ * Revision 1.76  1997-10-27 14:33:04  adam
+ * Moved towards generic character mapping depending on "structure"
+ * field in abstract syntax file. Fixed a few memory leaks. Fixed
+ * bug with negative integers when doing searches with relational
+ * operators.
+ *
+ * Revision 1.75  1997/09/17 12:19:12  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.74  1997/09/09 13:38:06  adam
  * Partial port to WIN95/NT.
  *
  * Revision 1.73  1997/09/04 13:57:20  adam
@@ -310,7 +320,7 @@ static void logRecord (int showFlag)
     }
 }
 
-void key_open (int mem)
+void key_open (BFiles bfs, int mem)
 {
     if (!mem)
         mem = atoi(res_get_def (common_resource, "memMax", "4"))*1024*1024;
@@ -323,13 +333,13 @@ void key_open (int mem)
     key_buf_used = 0;
     key_file_no = 0;
 
-    if (!(matchDict = dict_open (GMATCH_DICT, 50, 1)))
+    if (!(matchDict = dict_open (bfs, GMATCH_DICT, 50, 1)))
     {
         logf (LOG_FATAL, "dict_open fail of %s", GMATCH_DICT);
         exit (1);
     }
     assert (!records);
-    records = rec_open (1);
+    records = rec_open (bfs, 1);
 #if 1
     zti = zebTargetInfo_open (records, 1);
 #endif
@@ -503,7 +513,7 @@ void key_flush (void)
     key_buf_used = 0;
 }
 
-int key_close (void)
+int key_close ()
 {
     key_flush ();
     xfree (key_buf);
@@ -521,7 +531,7 @@ static void wordInit (RecWord *p)
 {
     p->attrSet = 1;
     p->attrUse = 1016;
-    p->which = Word_String;
+    p->reg_type = 'w';
 }
 
 struct recKeys {
@@ -585,19 +595,9 @@ static void addRecordKey (const RecWord *p)
         memcpy (dst, &attrUse, sizeof(attrUse));
         dst += sizeof(attrUse);
     }
-    switch (p->which)
-    {
-        case Word_String:
-            *dst++ = 'w';
-            break;
-        case Word_Phrase:
-            *dst++ = 'p';
-            break;
-        case Word_Numeric:
-            *dst++ = 'n';
-    }
-    for (i = 0; p->u.string[i] && i < IT_MAX_WORD-3; i++)
-        *dst++ = p->u.string[i];
+    *dst++ = p->reg_type;
+    for (i = 0; p->string[i] && i < IT_MAX_WORD-3; i++)
+        *dst++ = p->string[i];
     *dst++ = '\0';
 
     if (!diff)
@@ -985,6 +985,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         extractCtrl.subType = subType;
         extractCtrl.init = wordInit;
         extractCtrl.add = addRecordKey;
+	extractCtrl.dh = rGroup->dh;
 
         reckeys.buf_used = 0;
         reckeys.prevAttrUse = -1;
@@ -997,7 +998,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         extractCtrl.seekf = file_seek;
         extractCtrl.tellf = file_tell;
         extractCtrl.endf = file_end;
-        extractCtrl.map_chrs_input = map_chrs_input;
+	extractCtrl.zebra_maps = rGroup->zebra_maps;
         extractCtrl.flagShowRecords = rGroup->flagShowRecords;
         if (rGroup->flagShowRecords)
             printf ("File: %s %ld\n", fname, (long) recordOffset);