Simpleelement allows upper case (as well as lower case).

[yaz-moved-to-github.git] / retrieval / d1_espec.c

diff --git a/retrieval/d1_espec.c b/retrieval/d1_espec.c
index 0b6b638..d9a8d70 100644 (file)
--- a/retrieval/d1_espec.c
+++ b/retrieval/d1_espec.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_espec.c,v $
- * Revision 1.16  1999-08-27 09:40:32  adam
+ * Revision 1.19  2001-09-28 14:50:23  adam
+ * Simpleelement allows upper case (as well as lower case).
+ *
+ * Revision 1.18  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.17  1999/10/21 12:06:29  adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.16  1999/08/27 09:40:32  adam
  * Renamed logf function to yaz_log. Removed VC++ project files.
  *
  * Revision 1.15  1998/10/13 16:09:49  adam
@@ -69,11 +78,11 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <ctype.h>
-#include <odr.h>
-#include <proto.h>
-#include <log.h>
-#include <data1.h>
+
+#include <yaz/odr.h>
+#include <yaz/proto.h>
+#include <yaz/log.h>
+#include <yaz/data1.h>
 
 static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
                               const char *file, int lineno)
@@ -120,7 +129,7 @@ static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
            t->which = Z_Triple_null;
            t->value.null = odr_nullval();
        }
-       else if (isdigit(*value))
+       else if (d1_isdigit(*value))
        {
            t->which = Z_Triple_integer;
            t->value.integer = (int *)
@@ -167,7 +176,7 @@ static Z_Occurrences *read_occurrences(char *occ, NMEM nmem,
     {
        Z_OccurValues *ov = (Z_OccurValues *)nmem_malloc(nmem, sizeof(*ov));
     
-       if (!isdigit(*occ))
+       if (!d1_isdigit(*occ))
        {
            yaz_log(LOG_WARN, "%s:%d: Bad occurrences-spec %s",
                    file, lineno, occ);
@@ -210,7 +219,7 @@ static Z_ETagUnit *read_tagunit(char *buf, NMEM nmem,
        else
            u->u.wildThing = read_occurrences(0, nmem, file, lineno);
     }
-    else if ((terms = sscanf(buf, "(%d,%[^)]):%[a-z0-9+]", &type, value,
+    else if ((terms = sscanf(buf, "(%d,%[^)]):%[a-zA-Z0-9+]", &type, value,
                             occ)) >= 2)
     {
        int numval;