X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_espec.c;h=4b0ee907ffcc373638062a455387b8c17db9869d;hb=548d8ab9b0b5930db27643b47fc55afce5511219;hp=0b6b638c75931dc664fc84306e963eb2bfa4816c;hpb=b440dce0831a72bebe4f4821ab7771cc05e8facb;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_espec.c b/retrieval/d1_espec.c
index 0b6b638..4b0ee90 100644
--- a/retrieval/d1_espec.c
+++ b/retrieval/d1_espec.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_espec.c,v $
- * Revision 1.16  1999-08-27 09:40:32  adam
+ * 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 +75,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 +126,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 +173,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);