X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=grs.c;h=afcaa4bb6d698f9429bf3a6ae60f153317261535;hb=d60c3f162beb6a82545509f282585b6517933ae6;hp=c58d7c61a7518431e5951e34effbaac1a19d38e3;hpb=bc6bd3345159c5d9619098bb96327f2d87fad667;p=ir-tcl-moved-to-github.git

diff --git a/grs.c b/grs.c
index c58d7c6..afcaa4b 100644
--- a/grs.c
+++ b/grs.c
@@ -5,7 +5,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: grs.c,v $
- * Revision 1.4  1996-05-29 06:37:42  adam
+ * Revision 1.7  1996-06-05 09:26:20  adam
+ * Bug fix: the change above introduced an error.
+ *
+ * Revision 1.6  1996/06/05  08:59:23  adam
+ * Changed syntax of element specs in GRS-1 retrieval.
+ *
+ * Revision 1.5  1996/05/29  20:28:08  adam
+ * Bug fix: Function ir_tcl_grs_del sometimes free'd bad memory.
+ *
+ * Revision 1.4  1996/05/29  06:37:42  adam
  * Function ir_tcl_get_grs_r enhanced so that specific elements can be
  * extracted.
  *
@@ -45,7 +54,7 @@ void ir_tcl_grs_del (IrTcl_GRS_Record **grs_record)
     e = (*grs_record)->entries;
     for (i = 0; i < (*grs_record)->noTags; i++, e++)
     {
-        switch (e->tagType)
+        switch (e->tagWhich)
         {
         case Z_StringOrNumeric_numeric:
             break;
@@ -171,12 +180,14 @@ static int ir_tcl_get_grs_r (Tcl_Interp *interp, IrTcl_GRS_Record *grs_record,
         else
         {
             const char *cp0 = argv[argno];
-            const char *cp1 = strchr (cp0, '.');
+            const char *cp1 = strchr (cp0, ',');
 
             if (!cp1 || cp1-cp0 < 1)
                 yes = 1;
             else
             {
+                if (*cp0 == '(')
+                    cp0++;
                 if (atoi(cp0) == e->tagType) 
                 {
                     if (e->tagWhich == Z_StringOrNumeric_numeric)
@@ -186,7 +197,11 @@ static int ir_tcl_get_grs_r (Tcl_Interp *interp, IrTcl_GRS_Record *grs_record,
                     }
                     else
                     {
-                        if (!strcmp (cp1+1, e->tagVal.str))
+                        int len = strlen(cp1+1);
+                        if (cp1[len] == ')')
+                            len--;
+                        if (len && strlen(e->tagVal.str) == len &&
+                            !memcmp (cp1+1, e->tagVal.str, len))
                             yes = 1;
                     }
                 }