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 4bbd373..d9a8d70 100644 (file)
--- a/retrieval/d1_espec.c
+++ b/retrieval/d1_espec.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1995-1998, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_espec.c,v $
- * Revision 1.15  1998-10-13 16:09:49  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
  * Added support for arbitrary OID's for tagsets, schemas and attribute sets.
  * Added support for multiple attribute set references and tagset references
  * from an abstract syntax file.
@@ -66,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)
@@ -98,8 +110,8 @@ static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
 
        if (sscanf(argv[i], "(%d,%d,%[^)])", &zclass, &type, value) < 3)
        {
-           logf(LOG_WARN, "%s:%d: Syntax error in variant component '%s'",
-                file, lineno, argv[i]);
+           yaz_log(LOG_WARN, "%s:%d: Syntax error in variant component '%s'",
+                   file, lineno, argv[i]);
            return 0;
        }
        t = r->triples[i] = (Z_Triple *)nmem_malloc(nmem, sizeof(Z_Triple));
@@ -117,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 *)
@@ -164,10 +176,10 @@ 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))
        {
-           logf(LOG_WARN, "%s:%d: Bad occurrences-spec %s",
-                file, lineno, occ);
+           yaz_log(LOG_WARN, "%s:%d: Bad occurrences-spec %s",
+                   file, lineno, occ);
            return 0;
        }
        op->which = Z_Occurrences_values;
@@ -207,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;
@@ -261,7 +273,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
     
     if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
     {
-       logf(LOG_WARN|LOG_ERRNO, "%s", file);
+       yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
        return 0;
     }
     
@@ -280,8 +292,8 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
            
            if (!nnames)
            {
-               logf(LOG_WARN, "%s:%d: Empty elementsetnames directive",
-                    file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Empty elementsetnames directive",
+                       file, lineno);
                continue;
            }
            
@@ -299,15 +311,15 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               logf(LOG_WARN, "%s:%d: Bad # of args for %s",
-                    file, lineno, argv[0]);
+               yaz_log(LOG_WARN, "%s:%d: Bad # of args for %s",
+                       file, lineno, argv[0]);
                continue;
            }
            if (!(res->defaultVariantSetId =
                  odr_getoidbystr_nmem(nmem, argv[1])))
            {
-               logf(LOG_WARN, "%s:%d: Bad defaultvariantsetid",
-                    file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Bad defaultvariantsetid",
+                       file, lineno);
                continue;
            }
        }
@@ -315,8 +327,8 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               logf(LOG_WARN, "%s:%d: Bad # of args for %s",
-                    file, lineno, argv[0]);
+               yaz_log(LOG_WARN, "%s:%d: Bad # of args for %s",
+                       file, lineno, argv[0]);
                continue;
            }
            res->defaultTagType = (int *)nmem_malloc(nmem, sizeof(int));
@@ -327,8 +339,8 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
            if (!(res->defaultVariantRequest =
                  read_variant(argc-1, argv+1, nmem, file, lineno)))
            {
-               logf(LOG_WARN, "%s:%d: Bad defaultvariantrequest",
-                    file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Bad defaultvariantrequest",
+                       file, lineno);
                continue;
            }
        }
@@ -354,8 +366,8 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
            }
            if (argc < 2)
            {
-               logf(LOG_WARN, "%s:%d: Bad # of args for %s",
-                    file, lineno, argv[0]);
+               yaz_log(LOG_WARN, "%s:%d: Bad # of args for %s",
+                       file, lineno, argv[0]);
                continue;
            }
            
@@ -391,8 +403,8 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
                    read_variant(argc-3, argv+3, nmem, file, lineno);
        }
        else
-           logf(LOG_WARN, "%s:%d: Unknown directive '%s'",
-                file, lineno, argv[0]);
+           yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+                   file, lineno, argv[0]);
     fclose (f);
     return res;
 }