projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using the new ylog.h everywhere, and fixing what that breaks!
[idzebra-moved-to-github.git]
/
data1
/
d1_varset.c
diff --git
a/data1/d1_varset.c
b/data1/d1_varset.c
index
4369cd8
..
92c95a5
100644
(file)
--- a/
data1/d1_varset.c
+++ b/
data1/d1_varset.c
@@
-1,4
+1,4
@@
-/* $Id: d1_varset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_varset.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-24,8
+24,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <yaz/oid.h>
#include <stdlib.h>
#include <yaz/oid.h>
-#include <yaz/log.h>
-#include <data1.h>
+#include <yaz/ylog.h>
+#include <d1_absyn.h>
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
char *zclass, char *type)
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
char *zclass, char *type)
@@
-39,14
+39,20
@@
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
for (t = c->types; t; t = t->next)
if (!data1_matchstr(t->name, type))
return t;
for (t = c->types; t; t = t->next)
if (!data1_matchstr(t->name, type))
return t;
- yaz_log(LOG_WARN, "Unknown variant type %s in class %s",
+ yaz_log(YLOG_WARN, "Unknown variant type %s in class %s",
type, zclass);
return 0;
}
type, zclass);
return 0;
}
- yaz_log(LOG_WARN, "Unknown variant class %s", zclass);
+ yaz_log(YLOG_WARN, "Unknown variant class %s", zclass);
return 0;
}
return 0;
}
+data1_vartype *data1_getvartypeby_absyn (data1_handle dh, data1_absyn *absyn,
+ char *zclass, char *type)
+{
+ return data1_getvartypebyct(dh, absyn->varset, zclass, type);
+}
+
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
NMEM mem = data1_nmem_get (dh);
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
NMEM mem = data1_nmem_get (dh);
@@
-64,7
+70,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
if (!(f = data1_path_fopen(dh, file, "r")))
{
if (!(f = data1_path_fopen(dh, file, "r")))
{
- yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
}
while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
return 0;
}
while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
@@
-74,7
+80,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
if (argc != 3)
{
if (argc != 3)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # or args to class",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # or args to class",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-94,13
+100,13
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
if (!typep)
{
if (!typep)
{
- yaz_log(LOG_WARN, "%s:%d: Directive class must precede type",
+ yaz_log(YLOG_WARN, "%s:%d: Directive class must precede type",
file, lineno);
continue;
}
if (argc != 4)
{
file, lineno);
continue;
}
if (argc != 4)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # or args to type",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # or args to type",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-110,7
+116,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
r->type = atoi(argv[1]);
if (!(r->datatype = data1_maptype (dh, argv[3])))
{
r->type = atoi(argv[1]);
if (!(r->datatype = data1_maptype (dh, argv[3])))
{
- yaz_log(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown datatype '%s'",
file, lineno, argv[3]);
fclose(f);
return 0;
file, lineno, argv[3]);
fclose(f);
return 0;
@@
-122,7
+128,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for name",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for name",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-132,19
+138,19
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for reference",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for reference",
file, lineno);
continue;
}
if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
{
file, lineno);
continue;
}
if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
{
- yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);
continue;
}
}
else
file, lineno, argv[1]);
continue;
}
}
else
- yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
fclose(f);
file, lineno, argv[0]);
fclose(f);