More work on regular expression conversion.

diff --git a/index/Makefile b/index/Makefile
index 94d5b5a..cbddcf8 100644 (file)
--- a/index/Makefile
+++ b/index/Makefile
@@ -1,16 +1,16 @@
 # Copyright (C) 1995, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.26 1995-12-04 14:22:25 adam Exp $
+# $Id: Makefile,v 1.27 1995-12-04 17:59:15 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
 
-#YAZLIB=../../yaz/lib/libyaz.a
-YAZLIB=-lyaz
-#YAZINC=-I../../yaz/include
-#OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
-OSILIB=../../xtimosi/src/libmosi.a -lrfc
+YAZLIB=../../yaz/lib/libyaz.a
+#YAZLIB=-lyaz
+YAZINC=-I../../yaz/include
+OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
+#OSILIB=../../xtimosi/src/libmosi.a -lrfc
 #NETLIB=-lnsl -lsocket
 
 INCLUDE=-I../include $(YAZINC)

diff --git a/index/extract.c b/index/extract.c
index 6e0e35f..38b76bc 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.37  1995-12-04 14:22:27  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.
@@ -692,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;