From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 11 Oct 1996 10:56:58 +0000 (+0000)
Subject: New module recctrl. Used to manage records (extract/retrieval).
X-Git-Tag: ZEBRA.1.0~410
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=7332bdbc19cd0f8c88d7f4e38ffaae076c9a0a81

New module recctrl. Used to manage records (extract/retrieval).
Several files have been moved to the recctrl sub directory.
---

diff --git a/index/Makefile b/index/Makefile
index 0f6fc0a..57ddf29 100644
--- a/index/Makefile
+++ b/index/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1996, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.39 1996-06-04 14:18:52 quinn Exp $
+# $Id: Makefile,v 1.40 1996-10-11 10:56:58 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
@@ -19,20 +19,19 @@ TPROG2=kdump
 TPROG3=zebrasrv
 DEFS=$(INCLUDE)
 O1 = main.o dir.o dirs.o trav.o extract.o kinput.o kcompare.o \
- symtab.o text.o recctrl.o structrec.o recindex.o regxread.o recstat.o \
- lockutil.o lockidx.o zinfo.o invstat.o keychars.o
+ symtab.o recindex.o recstat.o lockutil.o lockidx.o \
+ zinfo.o invstat.o keychars.o 
 O2 = kdump.o
-O3 = zserver.o kcompare.o zrpn.o zsets.o text.o recctrl.o structrec.o  \
-	attribute.o recindex.o zlogs.o regxread.o lockutil.o locksrv.o \
-	zinfo.o keychars.o
+O3 = zserver.o kcompare.o zrpn.o zsets.o attribute.o recindex.o \
+ zlogs.o lockutil.o locksrv.o zinfo.o keychars.o
 CPP=$(CC) -E
 
 all: $(TPROG1) $(TPROG2) $(TPROG3)
 
-$(TPROG1): $(O1) ../lib/dict.a ../lib/isam.a \
+$(TPROG1): $(O1) ../lib/dict.a ../lib/isam.a ../lib/recctrl.a \
 		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a 
 	$(CC) $(CFLAGS) -o $(TPROG1) $(O1) \
-		../lib/dict.a ../lib/isam.a \
+		../lib/dict.a ../lib/isam.a ../lib/recctrl.a \
 		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a \
 		$(YAZLIB)
 
@@ -40,11 +39,11 @@ $(TPROG2): $(O2)
 	$(CC) $(CFLAGS) -o $(TPROG2) $(O2) ../lib/alexutil.a $(YAZLIB)
 
 $(TPROG3): $(O3) \
-		../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/bfile.a \
-		../lib/dfa.a ../lib/alexutil.a
+		../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/recctrl.a \
+		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a
 	$(CC) $(CFLAGS) -o $(TPROG3) $(O3) \
-		../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/bfile.a \
-		../lib/dfa.a ../lib/alexutil.a \
+		../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/recctrl.a \
+		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a \
 		$(YAZLIB) $(OSILIB) $(NETLIB) -lm
 
 .c.o:
diff --git a/index/extract.c b/index/extract.c
index 870dee3..ff5081c 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.61  1996-06-06 12:08:37  quinn
+ * Revision 1.62  1996-10-11 10:57:01  adam
+ * New module recctrl. Used to manage records (extract/retrieval).
+ * Several files have been moved to the recctrl sub directory.
+ *
+ * Revision 1.61  1996/06/06 12:08:37  quinn
  * Added showRecord function
  *
  * Revision 1.60  1996/06/04  10:18:12  adam
@@ -852,7 +856,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         extractCtrl.readf = file_read;
         extractCtrl.seekf = file_seek;
         extractCtrl.endf = file_end;
-	extractCtrl.group = rGroup;
+        extractCtrl.map_chrs_input = map_chrs_input;
+        extractCtrl.flagShowRecords = rGroup->flagShowRecords;
         r = (*recType->extract)(&extractCtrl);
 
         if (r)      
diff --git a/index/zebra.cfg b/index/zebra.cfg
index 1cf8a41..8e15c62 100644
--- a/index/zebra.cfg
+++ b/index/zebra.cfg
@@ -1,5 +1,5 @@
 # Zebra configuration file
-# $Id: zebra.cfg,v 1.1 1995-11-28 09:09:47 adam Exp $
+# $Id: zebra.cfg,v 1.2 1996-10-11 10:57:05 adam Exp $
 #
 #register: dir1:100M
 
@@ -8,7 +8,7 @@ news.recordType.: text
 news.database: news
 
 # Grs group. Indexed as GRS.
-grs.recordType.grs: grs
+grs.recordType.grs: grs.sgml
 grs.recordId: $database (1,12)
 grs.database: esdd