Changeset 656

Timestamp:

1999-10-12T11:01:40+13:00 (25 years ago)

Author:

cs025

Message:

Got rid of regular expression calls.

Location:

trunk/gsdl/src/mgpp/text

Files:

• grbIndex.cpp (modified) (3 diffs)
• mgquery.cpp (modified) (3 diffs)

trunk/gsdl/src/mgpp/text/grbIndex.cpp

@@ -24 +24 @@
 /*
    $Log$
+   Revision 1.2  1999/10/11 22:01:40  cs025
+   Got rid of regular expression calls.
+
    Revision 1.1  1999/10/11 02:57:15  cs025
    Base install of MG-PP
@@ -488 +491 @@
       post_proc = Xstrdup (start + 1);
       strcpy (start, finish + 1);
-      if (BooleanEnv (GetEnv ("verbatim"), 1) == 0)
-    {
-      char *s;
-      s = re_comp (post_proc);
-      if (!s)
-        {
-          Xfree (post_proc);
-          post_proc = NULL;
-        }
-    }
     }
   else if (start != NULL)
@@ -512 +505 @@
     return 1;
 
-  if (verbatim) {
-    return (strstr (UDoc, post_proc) != NULL);
-  }
-  return re_exec ((char *) UDoc);
+  return (strstr (UDoc, post_proc) != NULL);
 }
 

trunk/gsdl/src/mgpp/text/mgquery.cpp

@@ -24 +24 @@
 /*
    $Log$
+   Revision 1.2  1999/10/11 22:01:20  cs025
+   Got rid of regular expression calls.
+
    Revision 1.1  1999/10/11 02:58:09  cs025
    Base install of MG-PP
@@ -490 +493 @@
       post_proc = Xstrdup (start + 1);
       strcpy (start, finish + 1);
-      if (BooleanEnv (GetEnv ("verbatim"), 1) == 0)
-    {
-      char *s;
-      s = re_comp (post_proc);
-      if (!s)
-        {
-          Xfree (post_proc);
-          post_proc = NULL;
-        }
-    }
+      /**
+       * GRB: Elimination regular of expression support/dependency
+       *      removed the below from active use; assume verbatim
+       *      mode
+       if (BooleanEnv (GetEnv ("verbatim"), 1) == 0)
+     {
+       char *s;
+       s = re_comp (post_proc);
+       if (!s)
+       {
+       Xfree (post_proc);
+       post_proc = NULL;
+       }
+     }
+       */
     }
   else if (start != NULL)
@@ -514 +522 @@
     return 1;
 
-  if (verbatim) {
-    return (strstr (UDoc, post_proc) != NULL);
-  }
-  return re_exec ((char *) UDoc);
-}
+  /**
+   * GRB: eliminating regular expressions; removed all the below and
+   *      replaced with a strstr construct only 
+   if (verbatim) {
+     return (strstr (UDoc, post_proc) != NULL);
+   }
+   return re_exec ((char *) UDoc);
+   */
+  return (strstr(UDoc, post_proc) != NULL);
+}
+