/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_varset.c,v $
- * Revision 1.1 1995-11-01 11:56:09 quinn
+ * Revision 1.11 2002-04-04 20:49:46 adam
+ * New functions yaz_is_abspath, yaz_path_fopen_base
+ *
+ * Revision 1.10 1999/11/30 13:47:12 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.9 1999/08/27 09:40:32 adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.8 1998/10/13 16:09:54 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.
+ * Fixed many bad logs-calls in routines that read the various
+ * specifications regarding data1 (*.abs,*.att,...) and made the messages
+ * consistent whenever possible.
+ * Added extra 'lineno' argument to function readconf_line.
+ *
+ * Revision 1.7 1998/02/11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1997/09/17 12:10:39 adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.5 1997/09/05 09:50:58 adam
+ * Removed global data1_tabpath - uses data1_get_tabpath() instead.
+ *
+ * Revision 1.4 1997/05/14 06:54:04 adam
+ * C++ support.
+ *
+ * Revision 1.3 1995/11/01 16:34:58 quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.2 1995/11/01 13:54:50 quinn
+ * Minor adjustments
+ *
+ * Revision 1.1 1995/11/01 11:56:09 quinn
* Added Retrieval (data management) functions en masse.
*
*
#include <string.h>
#include <stdlib.h>
-#include <readconf.h>
-#include <oid.h>
-#include <alexutil.h>
-#include <log.h>
+#include <yaz/oid.h>
+#include <yaz/log.h>
+#include <yaz/data1.h>
-#include "data1.h"
-
-data1_vartype *data1_getvartypebyct(data1_varset *set, char *class, char *type)
+data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
+ char *zclass, char *type)
{
data1_varclass *c;
data1_vartype *t;
for (c = set->classes; c; c = c->next)
- if (!data1_matchstr(c->name, class))
+ if (!data1_matchstr(c->name, zclass))
{
for (t = c->types; t; t = t->next)
if (!data1_matchstr(t->name, type))
return t;
- logf(LOG_WARN, "Unknown variant type %s in class %s", type, class);
+ yaz_log(LOG_WARN, "Unknown variant type %s in class %s",
+ type, zclass);
return 0;
}
- logf(LOG_WARN, "Unknown variant class %s", class);
+ yaz_log(LOG_WARN, "Unknown variant class %s", zclass);
return 0;
}
-data1_varset *data1_read_varset(char *file)
+data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
- data1_varset *res = xmalloc(sizeof(*res));
- data1_varclass **classp = &res->classes, *class = 0;
+ NMEM mem = data1_nmem_get (dh);
+ data1_varset *res = (data1_varset *)nmem_malloc(mem, sizeof(*res));
+ data1_varclass **classp = &res->classes, *zclass = 0;
data1_vartype **typep = 0;
FILE *f;
+ int lineno = 0;
int argc;
char *argv[50],line[512];
res->reference = VAL_NONE;
res->classes = 0;
- if (!(f = fopen(file, "r")))
+ if (!(f = data1_path_fopen(dh, file, "r")))
{
- logf(LOG_WARN|LOG_ERRNO, "%s", file);
+ yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;
}
- while ((argc = readconf_line(f, line, 512, argv, 50)))
+ while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
if (!strcmp(argv[0], "class"))
{
data1_varclass *r;
-
+
if (argc != 3)
{
- logf(LOG_FATAL, "%s: malformed class directive", file);
- fclose(f);
- return 0;
+ yaz_log(LOG_WARN, "%s:%d: Bad # or args to class",
+ file, lineno);
+ continue;
}
- *classp = r = class = xmalloc(sizeof(*r));
+ *classp = r = zclass = (data1_varclass *)
+ nmem_malloc(mem, sizeof(*r));
r->set = res;
- r->class = atoi(argv[1]);
- r->name = xmalloc(strlen(argv[2])+1);
- strcpy(r->name, argv[2]);
+ r->zclass = atoi(argv[1]);
+ r->name = nmem_strdup(mem, argv[2]);
r->types = 0;
typep = &r->types;
r->next = 0;
if (!typep)
{
- logf(LOG_WARN, "%s: class directive must precede type", file);
- fclose(f);
- return 0;
+ yaz_log(LOG_WARN, "%s:%d: Directive class must precede type",
+ file, lineno);
+ continue;
}
if (argc != 4)
{
- logf(LOG_WARN, "%s: Malformed type directive", file);
- fclose(f);
- return 0;
+ yaz_log(LOG_WARN, "%s:%d: Bad # or args to type",
+ file, lineno);
+ continue;
}
- *typep = r = xmalloc(sizeof(*r));
- r->name = xmalloc(strlen(argv[2])+1);
- strcpy(r->name, argv[2]);
- r->class = class;
+ *typep = r = (data1_vartype *)nmem_malloc(mem, sizeof(*r));
+ r->name = nmem_strdup(mem, argv[2]);
+ r->zclass = zclass;
r->type = atoi(argv[1]);
- if (!(r->datatype = data1_maptype(argv[3])))
+ if (!(r->datatype = data1_maptype (dh, argv[3])))
{
- logf(LOG_WARN, "%s: Unknown datatype '%s'", file, argv[3]);
+ yaz_log(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+ file, lineno, argv[3]);
fclose(f);
return 0;
}
{
if (argc != 2)
{
- logf(LOG_WARN, "%s name: Expected 1 argument", file);
- fclose(f);
- return 0;
+ yaz_log(LOG_WARN, "%s:%d: Bad # args for name",
+ file, lineno);
+ continue;
}
- res->name = xmalloc(strlen(argv[1])+1);
- strcpy(res->name, argv[1]);
+ res->name = nmem_strdup(mem, argv[1]);
}
else if (!strcmp(argv[0], "reference"))
{
if (argc != 2)
{
- logf(LOG_WARN, "%s: reference: Expected 1 argument", file);
- fclose(f);
- return 0;
+ yaz_log(LOG_WARN, "%s:%d: Bad # args for reference",
+ file, lineno);
+ continue;
}
if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
{
- logf(LOG_WARN, "Unknown reference '%s' in %s", argv[1], file);
- fclose(f);
- return 0;
+ yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+ file, lineno, argv[1]);
+ continue;
}
}
else
- logf(LOG_WARN, "varset: Unknown directive '%s' in %s", argv[0],
- file);
-
+ yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ file, lineno, argv[0]);
+
fclose(f);
return res;
}
projects / yaz-moved-to-github.git / blobdiff