More work on regular expression conversion.

[idzebra-moved-to-github.git] / index / extract.c

diff --git a/index/extract.c b/index/extract.c
index d3a357d..38b76bc 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.35  1995-11-28 14:26:21  adam
+ * Revision 1.38  1995-12-04 17:59:21  adam
+ * More work on regular expression conversion.
+ *
+ * Revision 1.37  1995/12/04  14:22:27  adam
+ * Extra arg to recType_byName.
+ * Started work on new regular expression parsed input to
+ * structured records.
+ *
+ * Revision 1.36  1995/11/30  08:34:29  adam
+ * Started work on commit facility.
+ * Changed a few malloc/free to xmalloc/xfree.
+ *
+ * Revision 1.35  1995/11/28  14:26:21  adam
  * Bug fix: recordId with constant wasn't right.
  * Bug fix: recordId dictionary entry wasn't deleted when needed.
  *
@@ -315,10 +327,10 @@ static void addRecordKey (const RecWord *p)
     {
         char *b;
 
-        b = malloc (reckeys.buf_max += 65000);
+        b = xmalloc (reckeys.buf_max += 65000);
         if (reckeys.buf_used > 0)
             memcpy (b, reckeys.buf, reckeys.buf_used);
-        free (reckeys.buf);
+        xfree (reckeys.buf);
         reckeys.buf = b;
     }
     dst = reckeys.buf + reckeys.buf_used;
@@ -670,7 +682,8 @@ static char *fileMatchStr (struct recKeys *reckeys, struct recordGroup *rGroup,
 static int recordExtract (SYSNO *sysno, const char *fname,
                           struct recordGroup *rGroup, int deleteFlag,
                           int fd,
-                          RecType recType)
+                          RecType recType,
+                          const char *subType)
 {
     struct recExtractCtrl extractCtrl;
     int r;
@@ -682,7 +695,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
     {
         extractCtrl.fd = fd;
         /* extract keys */
-        extractCtrl.subType = "";
+        extractCtrl.subType = subType;
         extractCtrl.init = wordInit;
         extractCtrl.add = addRecordKeyAny;
 
@@ -786,18 +799,18 @@ static int recordExtract (SYSNO *sysno, const char *fname,
             }
         }
     }
-    free (rec->info[recInfo_fileType]);
+    xfree (rec->info[recInfo_fileType]);
     rec->info[recInfo_fileType] =
         rec_strdup (rGroup->recordType, &rec->size[recInfo_fileType]);
 
-    free (rec->info[recInfo_filename]);
+    xfree (rec->info[recInfo_filename]);
     rec->info[recInfo_filename] =
         rec_strdup (fname, &rec->size[recInfo_filename]);
 
-    free (rec->info[recInfo_delKeys]);
+    xfree (rec->info[recInfo_delKeys]);
     if (reckeys.buf_used > 0 && rGroup->flagStoreKeys == 1)
     {
-        rec->info[recInfo_delKeys] = malloc (reckeys.buf_used);
+        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]);
@@ -808,11 +821,11 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         rec->size[recInfo_delKeys] = 0;
     }
 
-    free (rec->info[recInfo_storeData]);
+    xfree (rec->info[recInfo_storeData]);
     if (rGroup->flagStoreData == 1)
     {
         rec->size[recInfo_storeData] = file_noread;
-        rec->info[recInfo_storeData] = malloc (file_noread);
+        rec->info[recInfo_storeData] = xmalloc (file_noread);
         if (file_noread < FILE_READ_BUFSIZE)
            memcpy (rec->info[recInfo_storeData], file_buf, file_noread);
         else
@@ -836,7 +849,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         rec->info[recInfo_storeData] = NULL;
         rec->size[recInfo_storeData] = 0;
     }
-    free (rec->info[recInfo_databaseName]);
+    xfree (rec->info[recInfo_databaseName]);
     rec->info[recInfo_databaseName] =
         rec_strdup (rGroup->databaseName, &rec->size[recInfo_databaseName]); 
 
@@ -851,6 +864,7 @@ int fileExtract (SYSNO *sysno, const char *fname,
     char gprefix[128];
     char ext[128];
     char ext_res[128];
+    char subType[128];
     RecType recType;
     struct recordGroup rGroupM;
     struct recordGroup *rGroup = &rGroupM;
@@ -895,7 +909,7 @@ int fileExtract (SYSNO *sysno, const char *fname,
         logf (LOG_LOG, "? record %s", fname);
         return 0;
     }
-    if (!(recType = recType_byName (rGroup->recordType)))
+    if (!(recType = recType_byName (rGroup->recordType, subType)))
     {
         logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
         return 0;
@@ -963,7 +977,7 @@ int fileExtract (SYSNO *sysno, const char *fname,
         }
     }
     file_read_start (fd);
-    recordExtract (sysno, fname, rGroup, deleteFlag, fd, recType);
+    recordExtract (sysno, fname, rGroup, deleteFlag, fd, recType, subType);
     file_read_stop (fd);
     if (fd != -1)
         close (fd);