X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fregxread.c;h=04d621e6eea257b6a3ab3f877909a0c9c6d8b341;hb=a9eae0225b1a51b0257f80d9da9f95475dd04f53;hp=d809993f04676233e44caae4f015cc627a21a108;hpb=20f1f9a8b62dc5e5b216617584ff78bce435dac3;p=idzebra-moved-to-github.git

diff --git a/recctrl/regxread.c b/recctrl/regxread.c
index d809993..04d621e 100644
--- a/recctrl/regxread.c
+++ b/recctrl/regxread.c
@@ -1,4 +1,4 @@
-/* $Id: regxread.c,v 1.52 2004-08-15 17:22:45 adam Exp $
+/* $Id: regxread.c,v 1.54 2004-09-28 10:15:03 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -29,7 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/tpath.h>
 #include <zebrautl.h>
 #include <dfa.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
 
 #if HAVE_TCL_H
 #include <tcl.h>
@@ -139,6 +139,7 @@ struct lexSpec {
 
 struct lexSpecs {
     struct lexSpec *spec;
+    char type[256];
 };
 
 static char *f_win_get (struct lexSpec *spec, off_t start_pos, off_t end_pos,
@@ -821,8 +822,8 @@ static void variantBegin (struct lexSpec *spec,
 #endif
 
     if (!(tp =
-	  data1_getvartypebyct(spec->dh, parent->root->u.root.absyn->varset,
-			       tclass, ttype)))
+	  data1_getvartypeby_absyn(spec->dh, parent->root->u.root.absyn,
+				   tclass, ttype)))
 	return;
     
     if (parent->which != DATA1N_variant)
@@ -1856,13 +1857,22 @@ void grs_destroy(void *clientData)
     xfree (specs);
 }
 
-void *grs_init(void)
+void *grs_init(Res res, RecType recType)
 {
     struct lexSpecs *specs = (struct lexSpecs *) xmalloc (sizeof(*specs));
     specs->spec = 0;
+    strcpy(specs->type, "");
     return specs;
 }
 
+
+void grs_config(void *clientData, Res res, const char *args)
+{
+    struct lexSpecs *specs = (struct lexSpecs *) clientData;
+    if (strlen(args) < sizeof(specs->type))
+	strcpy(specs->type, args);
+}
+
 data1_node *grs_read_regx (struct grs_read_info *p)
 {
     int res;
@@ -1872,11 +1882,11 @@ data1_node *grs_read_regx (struct grs_read_info *p)
 #if REGX_DEBUG
     logf (LOG_LOG, "grs_read_regx");
 #endif
-    if (!*curLexSpec || strcmp ((*curLexSpec)->name, p->type))
+    if (!*curLexSpec || strcmp ((*curLexSpec)->name, specs->type))
     {
         if (*curLexSpec)
             lexSpecDestroy (curLexSpec);
-        *curLexSpec = lexSpecCreate (p->type, p->dh);
+        *curLexSpec = lexSpecCreate (specs->type, p->dh);
         res = readFileSpec (*curLexSpec);
         if (res)
         {
@@ -1899,14 +1909,25 @@ data1_node *grs_read_regx (struct grs_read_info *p)
     return lexRoot (*curLexSpec, p->offset, "main");
 }
 
-static struct recTypeGrs regx_type = {
-    "regx",
+static int extract_regx(void *clientData, struct recExtractCtrl *ctrl)
+{
+    return zebra_grs_extract(clientData, ctrl, grs_read_regx);
+}
+
+static int retrieve_regx(void *clientData, struct recRetrieveCtrl *ctrl)
+{
+    return zebra_grs_retrieve(clientData, ctrl, grs_read_regx);
+}
+
+static struct recType regx_type = {
+    "grs.regx",
     grs_init,
+    grs_config,
     grs_destroy,
-    grs_read_regx
+    extract_regx,
+    retrieve_regx,
 };
 
-RecTypeGrs recTypeGrs_regx = &regx_type;
 
 #if HAVE_TCL_H
 data1_node *grs_read_tcl (struct grs_read_info *p)
@@ -1918,12 +1939,12 @@ data1_node *grs_read_tcl (struct grs_read_info *p)
 #if REGX_DEBUG
     logf (LOG_LOG, "grs_read_tcl");
 #endif
-    if (!*curLexSpec || strcmp ((*curLexSpec)->name, p->type))
+    if (!*curLexSpec || strcmp ((*curLexSpec)->name, specs->type))
     {
 	Tcl_Interp *tcl_interp;
         if (*curLexSpec)
             lexSpecDestroy (curLexSpec);
-        *curLexSpec = lexSpecCreate (p->type, p->dh);
+        *curLexSpec = lexSpecCreate (specs->type, p->dh);
 	Tcl_FindExecutable("");
 	tcl_interp = (*curLexSpec)->tcl_interp = Tcl_CreateInterp();
 	Tcl_Init(tcl_interp);
@@ -1954,12 +1975,38 @@ data1_node *grs_read_tcl (struct grs_read_info *p)
     return lexRoot (*curLexSpec, p->offset, "main");
 }
 
-static struct recTypeGrs tcl_type = {
-    "tcl",
+static int extract_tcl(void *clientData, struct recExtractCtrl *ctrl)
+{
+    return zebra_grs_extract(clientData, ctrl, grs_read_tcl);
+}
+
+static int retrieve_tcl(void *clientData, struct recRetrieveCtrl *ctrl)
+{
+    return zebra_grs_retrieve(clientData, ctrl, grs_read_tcl);
+}
+
+static struct recType tcl_type = {
+    "grs.tcl",
     grs_init,
+    grs_config,
     grs_destroy,
-    grs_read_tcl
+    extract_tcl,
+    retrieve_tcl,
 };
 
-RecTypeGrs recTypeGrs_tcl = &tcl_type;
 #endif
+
+RecType
+#ifdef IDZEBRA_STATIC_GRS_REGX
+idzebra_filter_grs_regx
+#else
+idzebra_filter
+#endif
+
+[] = {
+    &regx_type,
+#if HAVE_TCL_H
+    &tcl_type,
+#endif
+    0,
+};