X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fregxread.c;h=0416b95d3451a6b44b1e2babcef8e245dcfabab5;hb=eb15a2b4b168b0b618c12834735774667cd3a9ef;hp=2e51f6719c25dc5b2640f7e1957e47ad391d053a;hpb=b306d131fe1c06ca1d313f3b04a159b4a3a376f9;p=idzebra-moved-to-github.git

diff --git a/recctrl/regxread.c b/recctrl/regxread.c
index 2e51f67..0416b95 100644
--- a/recctrl/regxread.c
+++ b/recctrl/regxread.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: regxread.c,v $
- * Revision 1.14  1998-03-05 08:41:00  adam
+ * Revision 1.18  1998-10-15 13:11:47  adam
+ * Added support for option -record for "end element". When specified
+ * end element will mark end-of-record when at outer-level.
+ *
+ * Revision 1.17  1998/07/01 10:13:51  adam
+ * Minor fix.
+ *
+ * Revision 1.16  1998/06/30 15:15:09  adam
+ * Tags are trimmed: white space removed before- and after the tag.
+ *
+ * Revision 1.15  1998/06/30 12:55:45  adam
+ * Bug fix.
+ *
+ * Revision 1.14  1998/03/05 08:41:00  adam
  * Implemented rule contexts.
  *
  * Revision 1.13  1997/12/12 06:33:58  adam
@@ -132,6 +145,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <tpath.h>
 #include <zebrautl.h>
@@ -703,8 +717,6 @@ static void execData (struct lexSpec *spec,
             char *nb = xmalloc (elen + res->u.data.len);
             memcpy (nb, res->u.data.data, res->u.data.len);
             memcpy (nb + res->u.data.len, ebuf, elen);
-            if (res->u.data.len > DATA1_LOCALDATA)
-                xfree (res->u.data.data);
             res->u.data.data = nb;
             res->destroy = destroy_data;
         }
@@ -827,6 +839,19 @@ static void variantBegin (struct lexSpec *spec,
     d1_stack[++(*d1_level)] = NULL;
 }
 
+static void tagStrip (const char **tag, int *len)
+{
+    int i;
+
+    for (i = *len; i > 0 && isspace((*tag)[i-1]); --i)
+        ;
+    *len = i;
+    for (i = 0; i < *len && isspace((*tag)[i]); i++)
+        ;
+    *tag += i;
+    *len -= i;
+}
+
 static void tagBegin (struct lexSpec *spec, 
                       data1_node **d1_stack, int *d1_level,
                       const char *tag, int len)
@@ -843,7 +868,8 @@ static void tagBegin (struct lexSpec *spec,
         logf (LOG_WARN, "in element begin. No record type defined");
         return ;
     }
-    
+    tagStrip (&tag, &len);
+   
     res = data1_mk_node (spec->dh, spec->m);
     res->parent = parent;
     res->which = DATA1N_tag;
@@ -882,12 +908,15 @@ static void tagBegin (struct lexSpec *spec,
 }
 
 static void tagEnd (struct lexSpec *spec, 
-                    data1_node **d1_stack, int *d1_level,
+                    data1_node **d1_stack, int *d1_level, int min_level,
                     const char *tag, int len)
 {
-    while (*d1_level > 1)
+    tagStrip (&tag, &len);
+    while (*d1_level > min_level)
     {
         (*d1_level)--;
+        if (*d1_level == 0)
+	    break;
         if ((d1_stack[*d1_level]->which == DATA1N_tag) &&
 	    (!tag ||
 	     (strlen(d1_stack[*d1_level]->u.tag.tag) == (size_t) len &&
@@ -1202,23 +1231,30 @@ static int execCode (struct lexSpec *spec,
 	    }
 	    else if (!strcmp (p, "element"))
 	    {
-		r = execTok (spec, &s, arg_no, arg_start, arg_end,
-			     &cmd_str, &cmd_len);
-#if 0
-		if (*d1_level == 1)
-		{
-		    *d1_level = 0;
-		    returnCode = 0;
-		}
-#endif
+                int min_level = 1;
+                while ((r = execTok (spec, &s, arg_no, arg_start, arg_end,
+                                     &cmd_str, &cmd_len)) == 3)
+                {
+                    if (cmd_len==7 && !memcmp ("-record", cmd_str, cmd_len))
+                        min_level = 0;
+                }
 		if (r > 2)
 		{
-		    tagEnd (spec, d1_stack, d1_level, cmd_str, cmd_len);
+		    tagEnd (spec, d1_stack, d1_level, min_level,
+                            cmd_str, cmd_len);
 		    r = execTok (spec, &s, arg_no, arg_start, arg_end,
 				 &cmd_str, &cmd_len);
 		}
 		else
-		    tagEnd (spec, d1_stack, d1_level, NULL, 0);
+		    tagEnd (spec, d1_stack, d1_level, min_level, NULL, 0);
+                if (*d1_level == 0)
+                {
+#if REGX_DEBUG
+		    logf (LOG_DEBUG, "end element end records");
+#endif
+		    returnCode = 0;
+                }
+
 	    }
 	    else if (!strcmp (p, "context"))
 	    {
@@ -1270,7 +1306,7 @@ static int execCode (struct lexSpec *spec,
                          &cmd_str, &cmd_len);
             } while (r > 1);
             if (element_str)
-                tagEnd (spec, d1_stack, d1_level, NULL, 0);
+                tagEnd (spec, d1_stack, d1_level, 1, NULL, 0);
         }
         else if (!strcmp (p, "unread"))
         {
@@ -1605,6 +1641,7 @@ data1_node *grs_read_regx (struct grs_read_info *p)
             return NULL;
         }
     }
+    curLexSpec->dh = p->dh;
     if (!p->offset)
     {
         curLexSpec->f_win_start = 0;