Fixed "end element" to terminate record in outer-most level.

[idzebra-moved-to-github.git] / recctrl / regxread.c

diff --git a/recctrl/regxread.c b/recctrl/regxread.c
index 011213c..9b689f1 100644 (file)
--- a/recctrl/regxread.c
+++ b/recctrl/regxread.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: regxread.c,v $
- * Revision 1.2  1996-10-29 14:02:09  adam
+ * Revision 1.5  1997-02-19 16:22:33  adam
+ * Fixed "end element" to terminate record in outer-most level.
+ *
+ * Revision 1.4  1997/02/12 20:42:58  adam
+ * Changed some log messages.
+ *
+ * Revision 1.3  1996/11/08 14:05:33  adam
+ * Bug fix: data1 node member u.tag.get_bytes weren't initialized.
+ *
+ * Revision 1.2  1996/10/29  14:02:09  adam
  * Doesn't use the global data1_tabpath (from YAZ). Instead the function
  * data1_get_tabpath is used.
  *
@@ -374,7 +383,7 @@ static int readParseToken (const char **cpp, int *len)
         cmd[i] = '\0';
         if (i == 0)
         {
-            logf (LOG_WARN, "Bad character %d %c", *cp, *cp);
+            logf (LOG_WARN, "bad character %d %c", *cp, *cp);
             cp++;
             while (*cp && *cp != ' ' && *cp != '\t' && *cp != '\n')
                 cp++;
@@ -390,7 +399,7 @@ static int readParseToken (const char **cpp, int *len)
             return REGX_BODY;
         else
         {
-            logf (LOG_WARN, "Bad command %s", cmd);
+            logf (LOG_WARN, "bad command %s", cmd);
             return 0;
         }
     }
@@ -426,14 +435,14 @@ static int actionListMk (struct lexSpec *spec, const char *s,
             {
                 xfree (*ap);
                 *ap = NULL;
-                logf (LOG_WARN, "Regular expression error. r=%d", r);
+                logf (LOG_WARN, "regular expression error. r=%d", r);
                 return -1;
             }
             dfa_mkstate ((*ap)->u.pattern.dfa);
             s++;
             break;
         case REGX_BEGIN:
-            logf (LOG_WARN, "Cannot use begin here");
+            logf (LOG_WARN, "cannot use begin here");
             continue;
         case REGX_END:
             *ap = xmalloc (sizeof(**ap));
@@ -468,12 +477,12 @@ int readOneSpec (struct lexSpec *spec, const char *s)
         r = dfa_parse (spec->trans.dfa, &s);
         if (r)
         {
-            logf (LOG_WARN, "Regular expression error. r=%d", r);
+            logf (LOG_WARN, "regular expression error. r=%d", r);
             return -1;
         }
         if (*s != '/')
         {
-            logf (LOG_WARN, "Expects / at end of pattern. got %c", *s);
+            logf (LOG_WARN, "expects / at end of pattern. got %c", *s);
             return -1;
         }
         s++;
@@ -495,11 +504,11 @@ int readFileSpec (struct lexSpec *spec)
     FILE *spec_inf;
 
     lineBuf = xmalloc (1+lineSize);
-    logf (LOG_LOG, "Reading spec %s", spec->name);
+    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(), lineBuf, "r")))
     {
-        logf (LOG_ERRNO|LOG_WARN, "Cannot read spec file %s", spec->name);
+        logf (LOG_ERRNO|LOG_WARN, "cannot read spec file %s", spec->name);
         xfree (lineBuf);
         return -1;
     }
@@ -656,7 +665,7 @@ static void tagBegin (struct lexSpec *spec,
 
     if (*d1_level == 0)
     {
-        logf (LOG_WARN, "In element begin. No record type defined");
+        logf (LOG_WARN, "in element begin. No record type defined");
         return ;
     }
     
@@ -664,6 +673,7 @@ static void tagBegin (struct lexSpec *spec,
     res->parent = parent;
     res->which = DATA1N_tag;
     res->u.tag.tag = res->lbuf;
+    res->u.tag.get_bytes = -1;
 
     if (len >= DATA1_LOCALDATA)
         len = DATA1_LOCALDATA-1;
@@ -672,7 +682,7 @@ static void tagBegin (struct lexSpec *spec,
     res->u.tag.tag[len] = '\0';
    
 #if REGX_DEBUG 
-    logf (LOG_DEBUG, "Tag begin %s (%d)", res->u.tag.tag, *d1_level);
+    logf (LOG_DEBUG, "tag begin %s (%d)", res->u.tag.tag, *d1_level);
 #endif
     if (parent->which == DATA1N_variant)
         return ;
@@ -711,7 +721,7 @@ static void tagEnd (struct lexSpec *spec,
             break;
     }
 #if REGX_DEBUG
-    logf (LOG_DEBUG, "Tag end (%d)", *d1_level);
+    logf (LOG_DEBUG, "tag end (%d)", *d1_level);
 #endif
 }
 
@@ -983,6 +993,11 @@ static int execCode (struct lexSpec *spec,
                 {
                     r = execTok (spec, &s, arg_no, arg_start, arg_end,
                                  &cmd_str, &cmd_len);
+                    if (*d1_level == 1)
+                    {
+                        *d1_level = 0;
+                        returnCode = 0;
+                    }
                     if (r > 2)
                     {
                         tagEnd (spec, d1_stack, d1_level, cmd_str, cmd_len);
@@ -993,10 +1008,10 @@ static int execCode (struct lexSpec *spec,
                         tagEnd (spec, d1_stack, d1_level, NULL, 0);
                 }
                 else
-                    logf (LOG_WARN, "Missing record/element/variant");
+                    logf (LOG_WARN, "missing record/element/variant");
             }
             else
-                logf (LOG_WARN, "Missing record/element/variant");
+                logf (LOG_WARN, "missing record/element/variant");
         }
         else if (!strcmp (p, "data"))
         {
@@ -1017,12 +1032,12 @@ static int execCode (struct lexSpec *spec,
                         break;
                 }
                 else 
-                    logf (LOG_WARN, "Bad data option: %.*s",
+                    logf (LOG_WARN, "bad data option: %.*s",
                           cmd_len, cmd_str);
             }
             if (r != 2)
             {
-                logf (LOG_WARN, "Missing data item after data");
+                logf (LOG_WARN, "missing data item after data");
                 continue;
             }
             if (element_str)
@@ -1048,7 +1063,7 @@ static int execCode (struct lexSpec *spec,
                              &cmd_str, &cmd_len);
                 if (r < 2)
                 {
-                    logf (LOG_WARN, "Missing number after -offset");
+                    logf (LOG_WARN, "missing number after -offset");
                     continue;
                 }
                 p = regxStrz (cmd_str, cmd_len);
@@ -1060,12 +1075,12 @@ static int execCode (struct lexSpec *spec,
                 offset = 0;
             if (r < 2)
             {
-                logf (LOG_WARN, "Missing index after unread command");
+                logf (LOG_WARN, "missing index after unread command");
                 continue;
             }
             if (cmd_len != 1 || *cmd_str < '0' || *cmd_str > '9')
             {
-                logf (LOG_WARN, "Bad index after unread command");
+                logf (LOG_WARN, "bad index after unread command");
                 continue;
             }
             else
@@ -1080,14 +1095,14 @@ static int execCode (struct lexSpec *spec,
         }
         else
         {
-            logf (LOG_WARN, "Unknown code command: %.*s", cmd_len, cmd_str);
+            logf (LOG_WARN, "unknown code command: %.*s", cmd_len, cmd_str);
             r = execTok (spec, &s, arg_no, arg_start, arg_end,
                          &cmd_str, &cmd_len);
             continue;
         }
         if (r > 1)
         {
-            logf (LOG_WARN, "Ignoring token %.*s", cmd_len, cmd_str);
+            logf (LOG_WARN, "ignoring token %.*s", cmd_len, cmd_str);
             do {
                 r = execTok (spec, &s, arg_no, arg_start, arg_end, &cmd_str,
                              &cmd_len);