* OF THIS SOFTWARE.
*
* $Log: data1.h,v $
- * Revision 1.41 1999-07-13 13:23:47 adam
+ * Revision 1.42 1999-10-21 12:06:28 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.41 1999/07/13 13:23:47 adam
* Non-recursive version of data1_read_node. data1_read_nodex reads
* stream of bytes (instead of buffer in memory).
*
#include <yaz-util.h>
#include <wrbuf.h>
+#define d1_isspace(c) strchr(" \r\n\t\f", c)
+#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
#ifdef __cplusplus
extern "C" {
#endif
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_absyn.c,v $
- * Revision 1.24 1999-08-27 09:40:32 adam
+ * Revision 1.25 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.24 1999/08/27 09:40:32 adam
* Renamed logf function to yaz_log. Removed VC++ project files.
*
* Revision 1.23 1998/10/15 08:29:16 adam
*
*/
-#include <ctype.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_attset.c,v $
- * Revision 1.12 1999-08-27 09:40:32 adam
+ * Revision 1.13 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.12 1999/08/27 09:40:32 adam
* Renamed logf function to yaz_log. Removed VC++ project files.
*
* Revision 1.11 1998/10/14 13:31:56 adam
*
*/
-#include <ctype.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_espec.c,v $
- * Revision 1.16 1999-08-27 09:40:32 adam
+ * 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
#include <stdlib.h>
#include <assert.h>
#include <string.h>
-#include <ctype.h>
#include <odr.h>
#include <proto.h>
#include <log.h>
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 *)
{
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);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_map.c,v $
- * Revision 1.15 1999-08-27 09:40:32 adam
+ * Revision 1.16 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.15 1999/08/27 09:40:32 adam
* Renamed logf function to yaz_log. Removed VC++ project files.
*
* Revision 1.14 1998/10/13 16:09:50 adam
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <oid.h>
#include <log.h>
(*mtp)->new_field = 1;
else
(*mtp)->new_field = 0;
- if ((type != 3 || local_numeric) && isdigit(*valstr))
+ if ((type != 3 || local_numeric) && d1_isdigit(*valstr))
{
(*mtp)->which = D1_MAPTAG_numeric;
(*mtp)->value.numeric = atoi(valstr);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_marc.c,v $
- * Revision 1.14 1999-08-27 09:40:32 adam
+ * Revision 1.15 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.14 1999/08/27 09:40:32 adam
* Renamed logf function to yaz_log. Removed VC++ project files.
*
* Revision 1.13 1998/10/13 16:09:52 adam
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <oid.h>
#include <log.h>
}
*len = n->u.data.len;
- while (*len && isspace(n->u.data.data[*len - 1]))
+ while (*len && d1_isspace(n->u.data.data[*len - 1]))
(*len)--;
return n->u.data.data;
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_read.c,v $
- * Revision 1.28 1999-10-21 09:50:33 adam
+ * Revision 1.29 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.28 1999/10/21 09:50:33 adam
* SGML reader uses own isspace - it doesn't do 8-bit on WIN32!
*
* Revision 1.27 1999/08/27 09:40:32 adam
#include <log.h>
#include <data1.h>
-#define d1_isspace(c) strchr(" \r\n\t\f", c)
/*
* get the tag which is the immediate parent of this node (this may mean
* traversing intermediate things like variants and stuff.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_sutrs.c,v $
- * Revision 1.4 1997-09-17 12:10:38 adam
+ * Revision 1.5 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.4 1997/09/17 12:10:38 adam
* YAZ version 1.4.
*
* Revision 1.3 1995/12/15 16:57:11 quinn
*
*/
-#include <ctype.h>
-
#include <data1.h>
#define NTOBUF_INDENT 2
{
int l = 0;
- while (*b && !isspace(*b))
+ while (*b && !d1_isspace(*b))
l++, b++;
return l;
}
{
int wlen;
- while (l && isspace(*p))
+ while (l && d1_isspace(*p))
p++, l--;
if (!l)
break;
wrbuf_putc(b, ' ');
col++;
}
- while (l && !isspace(*p))
+ while (l && !d1_isspace(*p))
{
if (col > NTOBUF_MARGIN)
{
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_tagset.c,v $
- * Revision 1.12 1999-08-27 09:40:32 adam
+ * Revision 1.13 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.12 1999/08/27 09:40:32 adam
* Renamed logf function to yaz_log. Removed VC++ project files.
*
* Revision 1.11 1998/10/19 14:16:36 adam
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <string.h>
#include <log.h>
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_write.c,v $
- * Revision 1.6 1999-07-06 12:16:00 adam
+ * Revision 1.7 1999-10-21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.6 1999/07/06 12:16:00 adam
* Improved layout generated record in SGML/XML format.
*
* Revision 1.5 1998/06/05 08:57:43 adam
*/
#include <string.h>
-#include <ctype.h>
#include <data1.h>
#include <wrbuf.h>
{
int l = 0;
- while (l < max && !isspace(*b))
+ while (l < max && !d1_isspace(*b))
l++, b++;
return l;
}
{
int wlen;
- while (l && isspace(*p))
+ while (l && d1_isspace(*p))
p++, l--;
if (!l)
break;
wrbuf_putc(b, ' ');
lcol++;
}
- while (l && !isspace(*p))
+ while (l && !d1_isspace(*p))
{
wrbuf_putc(b, *p);
p++;