X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fregxread.c;h=76f8e59d785022c1f6567698ce568ecf32407760;hb=78e20a4e6a704e81bddb2ac37caf83f5a670041d;hp=74e1f5c7a7a6643e542ccc19fa3c2e58dcad656e;hpb=4415da5dbbba04e50d4524347486d60113ed569c;p=idzebra-moved-to-github.git

diff --git a/recctrl/regxread.c b/recctrl/regxread.c
index 74e1f5c..76f8e59 100644
--- a/recctrl/regxread.c
+++ b/recctrl/regxread.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: regxread.c,v $
- * Revision 1.23  1999-05-20 12:57:18  adam
+ * Revision 1.27  1999-06-28 13:25:40  quinn
+ * Improved diagnostics for Tcl
+ *
+ * Revision 1.26  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.25  1999/05/25 12:33:32  adam
+ * Fixed bug in Tcl filter.
+ *
+ * Revision 1.24  1999/05/21 11:08:46  adam
+ * Tcl filter attempts to read <filt>.tflt. Improvements to configure
+ * script so that it reads uninstalled Tcl source.
+ *
+ * Revision 1.23  1999/05/20 12:57:18  adam
  * Implemented TCL filter. Updated recctrl system.
  *
  * Revision 1.22  1998/11/03 16:07:13  adam
@@ -288,7 +301,7 @@ static char *f_win_get (struct lexSpec *spec, off_t start_pos, off_t end_pos,
         spec->f_win_start = start_pos;
 
         if (!spec->f_win_buf)
-            spec->f_win_buf = xmalloc (spec->f_win_size);
+            spec->f_win_buf = (char *) xmalloc (spec->f_win_size);
         *size = (*spec->f_win_rf)(spec->f_win_fh, spec->f_win_buf,
                                   spec->f_win_size);
         spec->f_win_end = spec->f_win_start + *size;
@@ -344,8 +357,8 @@ static void regxCodeMk (struct regxCode **pp, const char *buf, int len)
 {
     struct regxCode *p;
 
-    p = xmalloc (sizeof(*p));
-    p->str = xmalloc (len+1);
+    p = (struct regxCode *) xmalloc (sizeof(*p));
+    p->str = (char *) xmalloc (len+1);
     memcpy (p->str, buf, len);
     p->str[len] = '\0';
     *pp = p;
@@ -385,7 +398,7 @@ static void actionListDel (struct lexRuleAction **rap)
 
 static struct lexContext *lexContextCreate (const char *name)
 {
-    struct lexContext *p = xmalloc (sizeof(*p));
+    struct lexContext *p = (struct lexContext *) xmalloc (sizeof(*p));
 
     p->name = xstrdup (name);
     p->ruleNo = 1;
@@ -422,8 +435,8 @@ static struct lexSpec *lexSpecCreate (const char *name, data1_handle dh)
     struct lexSpec *p;
     int i;
     
-    p = xmalloc (sizeof(*p));
-    p->name = xmalloc (strlen(name)+1);
+    p = (struct lexSpec *) xmalloc (sizeof(*p));
+    p->name = (char *) xmalloc (strlen(name)+1);
     strcpy (p->name, name);
 
 #if HAVE_TCL_H
@@ -432,19 +445,21 @@ static struct lexSpec *lexSpecCreate (const char *name, data1_handle dh)
     p->dh = dh;
     p->context = NULL;
     p->context_stack_size = 100;
-    p->context_stack = xmalloc (sizeof(*p->context_stack) *
-				p->context_stack_size);
+    p->context_stack = (struct lexContext **)
+	xmalloc (sizeof(*p->context_stack) * p->context_stack_size);
     p->f_win_buf = NULL;
 
     p->maxLevel = 128;
-    p->concatBuf = xmalloc (sizeof(*p->concatBuf) * p->maxLevel);
+    p->concatBuf = (struct lexConcatBuf **)
+	xmalloc (sizeof(*p->concatBuf) * p->maxLevel);
     for (i = 0; i < p->maxLevel; i++)
     {
-	p->concatBuf[i] = xmalloc (sizeof(**p->concatBuf));
+	p->concatBuf[i] = (struct lexConcatBuf *)
+	    xmalloc (sizeof(**p->concatBuf));
 	p->concatBuf[i]->len = p->concatBuf[i]->max = 0;
 	p->concatBuf[i]->buf = 0;
     }
-    p->d1_stack = xmalloc (sizeof(*p->d1_stack) * p->maxLevel);
+    p->d1_stack = (data1_node **) xmalloc (sizeof(*p->d1_stack) * p->maxLevel);
     p->d1_level = 0;
     return p;
 }
@@ -524,7 +539,7 @@ static int readParseToken (const char **cpp, int *len)
                 cmd[i] = *cp + 'a' - 'A';
             else
                 break;
-            if (i < sizeof(cmd)-2)
+            if (i < (int) sizeof(cmd)-2)
 		i++;
             cp++;
         }
@@ -572,13 +587,13 @@ static int actionListMk (struct lexSpec *spec, const char *s,
             bodyMark = 1;
             continue;
         case REGX_CODE:
-            *ap = xmalloc (sizeof(**ap));
+            *ap = (struct lexRuleAction *) xmalloc (sizeof(**ap));
             (*ap)->which = tok;
             regxCodeMk (&(*ap)->u.code, s, len);
             s += len+1;
             break;
         case REGX_PATTERN:
-            *ap = xmalloc (sizeof(**ap));
+            *ap = (struct lexRuleAction *) xmalloc (sizeof(**ap));
             (*ap)->which = tok;
             (*ap)->u.pattern.body = bodyMark;
             bodyMark = 0;
@@ -602,7 +617,7 @@ static int actionListMk (struct lexSpec *spec, const char *s,
             logf (LOG_WARN, "cannot use INIT here");
             continue;
         case REGX_END:
-            *ap = xmalloc (sizeof(**ap));
+            *ap = (struct lexRuleAction *) xmalloc (sizeof(**ap));
             (*ap)->which = tok;
             break;
         }
@@ -670,7 +685,7 @@ int readOneSpec (struct lexSpec *spec, const char *s)
             return -1;
         }
         s++;
-        rp = xmalloc (sizeof(*rp));
+        rp = (struct lexRule *) xmalloc (sizeof(*rp));
         rp->info.no = spec->context->ruleNo++;
         rp->next = spec->context->rules;
         spec->context->rules = rp;
@@ -685,18 +700,32 @@ int readFileSpec (struct lexSpec *spec)
     char *lineBuf;
     int lineSize = 512;
     int c, i, errors = 0;
-    FILE *spec_inf;
+    FILE *spec_inf = 0;
 
-    lineBuf = xmalloc (1+lineSize);
-    logf (LOG_LOG, "reading regx filter %s.flt", spec->name);
-    sprintf (lineBuf, "%s.flt", spec->name);
-    if (!(spec_inf = yaz_path_fopen (data1_get_tabpath(spec->dh),
-				     lineBuf, "r")))
+    lineBuf = (char *) xmalloc (1+lineSize);
+#if HAVE_TCL_H
+    if (spec->tcl_interp)
+    {
+	sprintf (lineBuf, "%s.tflt", spec->name);
+	spec_inf = yaz_path_fopen (data1_get_tabpath(spec->dh), lineBuf, "r");
+    }
+#endif
+    if (!spec_inf)
+    {
+	sprintf (lineBuf, "%s.flt", spec->name);
+	spec_inf = yaz_path_fopen (data1_get_tabpath(spec->dh), lineBuf, "r");
+    }
+    if (!spec_inf)
     {
         logf (LOG_ERRNO|LOG_WARN, "cannot read spec file %s", spec->name);
         xfree (lineBuf);
         return -1;
     }
+    logf (LOG_LOG, "reading regx filter %s", lineBuf);
+#if HAVE_TCL_H
+    if (spec->tcl_interp)
+	logf (LOG_LOG, "Tcl enabled");
+#endif
     spec->lineNo = 0;
     c = getc (spec_inf);
     while (c != EOF)
@@ -748,7 +777,8 @@ int readFileSpec (struct lexSpec *spec)
     for (lc = spec->context; lc; lc = lc->next)
     {
 	struct lexRule *rp;
-	lc->fastRule = xmalloc (sizeof(*lc->fastRule) * lc->ruleNo);
+	lc->fastRule = (struct lexRuleInfo **)
+	    xmalloc (sizeof(*lc->fastRule) * lc->ruleNo);
 	for (i = 0; i < lc->ruleNo; i++)
 	    lc->fastRule[i] = NULL;
 	for (rp = lc->rules; rp; rp = rp->next)
@@ -824,7 +854,7 @@ static void execData (struct lexSpec *spec,
 	char *old_buf, *new_buf;
 
 	spec->concatBuf[spec->d1_level]->max = org_len + elen + 256;
-	new_buf = xmalloc (spec->concatBuf[spec->d1_level]->max);
+	new_buf = (char *) xmalloc (spec->concatBuf[spec->d1_level]->max);
 	if ((old_buf = spec->concatBuf[spec->d1_level]->buf))
 	{
 	    memcpy (new_buf, old_buf, org_len);
@@ -854,7 +884,7 @@ static void tagDataRelease (struct lexSpec *spec)
 	assert (!res->u.data.data);
 	assert (res->u.data.len > 0);
 	if (res->u.data.len > DATA1_LOCALDATA)
-	    res->u.data.data = nmem_malloc (spec->m, res->u.data.len);
+	    res->u.data.data = (char *) nmem_malloc (spec->m, res->u.data.len);
 	else
 	    res->u.data.data = res->lbuf;
 	memcpy (res->u.data.data, spec->concatBuf[spec->d1_level]->buf,
@@ -990,7 +1020,7 @@ static void tagBegin (struct lexSpec *spec,
     res->u.tag.get_bytes = -1;
 
     if (len >= DATA1_LOCALDATA)
-	res->u.tag.tag = nmem_malloc (spec->m, len+1);
+	res->u.tag.tag = (char *) nmem_malloc (spec->m, len+1);
     else
 	res->u.tag.tag = res->lbuf;
 
@@ -1192,7 +1222,7 @@ static char *regxStrz (const char *src, int len, char *str)
 static int cmd_tcl_begin (ClientData clientData, Tcl_Interp *interp,
 			  int argc, char **argv)
 {
-    struct lexSpec *spec = clientData;
+    struct lexSpec *spec = (struct lexSpec *) clientData;
     if (argc < 2)
 	return TCL_ERROR;
     if (!strcmp(argv[1], "record") && argc == 3)
@@ -1252,7 +1282,7 @@ static int cmd_tcl_begin (ClientData clientData, Tcl_Interp *interp,
 static int cmd_tcl_end (ClientData clientData, Tcl_Interp *interp,
 			int argc, char **argv)
 {
-    struct lexSpec *spec = clientData;
+    struct lexSpec *spec = (struct lexSpec *) clientData;
     if (argc < 2)
 	return TCL_ERROR;
     
@@ -1272,17 +1302,15 @@ static int cmd_tcl_end (ClientData clientData, Tcl_Interp *interp,
     {
 	int min_level = 1;
 	char *element = 0;
-	if (!strcmp(argv[2], "-record"))
+	if (argc >= 3 && !strcmp(argv[2], "-record"))
 	{
 	    min_level = 0;
 	    if (argc == 4)
 		element = argv[3];
 	}
 	else
-	{
 	    if (argc == 3)
 		element = argv[2];
-	}
 	tagEnd (spec, min_level, element, (element ? strlen(element) : 0));
 	if (spec->d1_level == 0)
 	{
@@ -1311,7 +1339,7 @@ static int cmd_tcl_data (ClientData clientData, Tcl_Interp *interp,
     int argi = 1;
     int textFlag = 0;
     const char *element = 0;
-    struct lexSpec *spec = clientData;
+    struct lexSpec *spec = (struct lexSpec *) clientData;
     
     while (argi < argc)
     {
@@ -1345,7 +1373,7 @@ static int cmd_tcl_data (ClientData clientData, Tcl_Interp *interp,
 static int cmd_tcl_unread (ClientData clientData, Tcl_Interp *interp,
 			   int argc, char **argv)
 {
-    struct lexSpec *spec = clientData;
+    struct lexSpec *spec = (struct lexSpec *) clientData;
     int argi = 1;
     int offset = 0;
     int no;
@@ -1392,7 +1420,15 @@ static void execTcl (struct lexSpec *spec, struct regxCode *code)
 	    var_buf[var_len] = ch;
 	}
     }
-    Tcl_Eval (spec->tcl_interp, code->str);
+    if (Tcl_Eval (spec->tcl_interp, code->str) != TCL_OK)
+    {
+    	const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);
+	logf(LOG_FATAL, "Tcl error, line=%d, \"%s\"\n%s", 
+	    spec->tcl_interp->errorLine,
+	    spec->tcl_interp->result,
+	    err ? err : "[NO ERRORINFO]");
+    }
+
 }
 /* HAVE_TCL_H */
 #endif
@@ -1936,7 +1972,7 @@ static data1_node *lexRoot (struct lexSpec *spec, off_t offset,
 
 void grs_destroy(void *clientData)
 {
-    struct lexSpecs *specs = clientData;
+    struct lexSpecs *specs = (struct lexSpecs *) clientData;
     if (specs->spec)
     {
 	lexSpecDestroy(&specs->spec);
@@ -1946,7 +1982,7 @@ void grs_destroy(void *clientData)
 
 void *grs_init(void)
 {
-    struct lexSpecs *specs = xmalloc (sizeof(*specs));
+    struct lexSpecs *specs = (struct lexSpecs *) xmalloc (sizeof(*specs));
     specs->spec = 0;
     return specs;
 }
@@ -1954,7 +1990,7 @@ void *grs_init(void)
 data1_node *grs_read_regx (struct grs_read_info *p)
 {
     int res;
-    struct lexSpecs *specs = p->clientData;
+    struct lexSpecs *specs = (struct lexSpecs *) p->clientData;
     struct lexSpec **curLexSpec = &specs->spec;
 
 #if REGX_DEBUG
@@ -2000,7 +2036,7 @@ RecTypeGrs recTypeGrs_regx = &regx_type;
 data1_node *grs_read_tcl (struct grs_read_info *p)
 {
     int res;
-    struct lexSpecs *specs = p->clientData;
+    struct lexSpecs *specs = (struct lexSpecs *) p->clientData;
     struct lexSpec **curLexSpec = &specs->spec;
 
 #if REGX_DEBUG