/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_tagset.c,v $
- * Revision 1.2 1995-11-01 13:54:49 quinn
+ * Revision 1.11 1998-10-19 14:16:36 adam
+ * Fixed data1_gettagbyname. Bug introduced by previous revision.
+ *
+ * Revision 1.10 1998/10/15 08:29:17 adam
+ * Tag set type may be specified in reference to it using "tagset"
+ * directive in .abs-files and "include" directive in .tag-files.
+ *
+ * Revision 1.9 1998/10/13 16:09:53 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.8 1998/05/18 13:07:07 adam
+ * Changed the way attribute sets are handled by the retriaval module.
+ * Extended Explain conversion / schema.
+ * Modified server and client to work with ASN.1 compiled protocol handlers.
+ *
+ * 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:38 adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.5 1997/09/05 09:50:57 adam
+ * Removed global data1_tabpath - uses data1_get_tabpath() instead.
+ *
+ * Revision 1.4 1995/11/13 09:27:38 quinn
+ * Fiddling with the variant stuff.
+ *
+ * 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:49 quinn
* Minor adjustments
*
* Revision 1.1 1995/11/01 11:56:09 quinn
#include <ctype.h>
#include <string.h>
-#include <xmalloc.h>
#include <log.h>
-
#include <data1.h>
/*
* functions eventually.
*/
-data1_datatype data1_maptype(char *t)
+data1_datatype data1_maptype (data1_handle dh, char *t)
{
static struct
{
{"intunit", DATA1K_intunit},
{"int", DATA1K_int},
{"octetstring", DATA1K_octetstring},
- {0, -1}
+ {"null", DATA1K_null},
+ {NULL, (data1_datatype) -1}
};
int i;
for (i = 0; types[i].tname; i++)
if (!data1_matchstr(types[i].tname, t))
return types[i].type;
- return 0;
+ return DATA1K_unknown;
}
-data1_tag *data1_gettagbynum(data1_tagset *s, int type, int value)
+data1_tag *data1_gettagbynum (data1_handle dh, data1_tagset *s,
+ int type, int value)
{
data1_tag *r;
-
+
for (; s; s = s->next)
{
/* scan local set */
if (r->which == DATA1T_numeric && r->value.numeric == value)
return r;
/* scan included sets */
- if (s->children && (r = data1_gettagbynum(s->children, type, value)))
+ if (s->children &&
+ (r = data1_gettagbynum (dh, s->children, type, value)))
return r;
}
return 0;
}
-data1_tag *data1_gettagbyname(data1_tagset *s, char *name)
+data1_tag *data1_gettagbyname (data1_handle dh, data1_tagset *s,
+ const char *name)
{
data1_tag *r;
return r;
}
/* scan included sets */
- if (s->children && (r = data1_gettagbyname(s->children, name)))
+ if (s->children && (r = data1_gettagbyname (dh, s->children, name)))
return r;
}
return 0;
}
-data1_tagset *data1_read_tagset(char *file)
+data1_tagset *data1_empty_tagset (data1_handle dh)
{
- char line[512], *r, cmd[512], args[512];
- data1_tagset *res = 0, **childp;
+ data1_tagset *res =
+ (data1_tagset *) nmem_malloc(data1_nmem_get (dh), sizeof(*res));
+ res->name = 0;
+ res->reference = VAL_NONE;
+ res->tags = 0;
+ res->type = 0;
+ res->children = 0;
+ res->next = 0;
+ return res;
+}
+
+data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
+{
+ NMEM mem = data1_nmem_get (dh);
+ data1_tagset *res = 0;
+ data1_tagset **childp;
data1_tag **tagp;
FILE *f;
+ int lineno = 0;
+ int argc;
+ char *argv[50], line[512];
- if (!(f = fopen(file, "r")))
+ if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
{
logf(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;
}
-
- if (!(res = xmalloc(sizeof(*res))))
- abort();
- res->name = 0;
- res->type = 0;
- res->tags = 0;
- res->children = 0;
- res->next = 0;
+ res = data1_empty_tagset (dh);
+ res->type = type;
childp = &res->children;
tagp = &res->tags;
- for (;;)
+ while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
{
- while ((r = fgets(line, 512, f)))
- {
- while (*r && isspace(*r))
- r++;
- if (*r && *r != '#')
- break;
- }
- if (!r)
- {
- fclose(f);
- return res;
- }
- if (sscanf(r, "%s %[^\n]", cmd, args) < 2)
- *args = '\0';
+ char *cmd = *argv;
if (!strcmp(cmd, "tag"))
{
int value;
- char names[512], type[512], *nm;
+ char *names, *type, *nm;
data1_tag *rr;
data1_name **npp;
- if (sscanf(args, "%d %s %s", &value, names, type) < 3)
+ if (argc != 4)
{
- logf(LOG_WARN, "Bad number of parms in '%s' in %s",
- args, file);
- fclose(f);
- return 0;
+ logf(LOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
+ continue;
}
- if (!(rr = *tagp = xmalloc(sizeof(*rr))))
- abort();
+ value = atoi(argv[1]);
+ names = argv[2];
+ type = argv[3];
+ rr = *tagp = (data1_tag *)nmem_malloc(mem, sizeof(*rr));
rr->tagset = res;
rr->next = 0;
rr->which = DATA1T_numeric;
* how to deal with local numeric tags?
*/
- if (!(rr->kind = data1_maptype(type)))
+ if (!(rr->kind = data1_maptype(dh, type)))
{
- logf(LOG_WARN, "Unknown datatype %s in %s", type, file);
+ logf(LOG_WARN, "%s:%d: Unknown datatype %s",
+ file, lineno, type);
fclose(f);
return 0;
}
{
char *e;
- if (!(*npp = xmalloc(sizeof(**npp))))
- abort();
+ *npp = (data1_name *)nmem_malloc(mem, sizeof(**npp));
if ((e = strchr(nm, '/')))
*(e++) = '\0';
- if (!((*npp)->name = xmalloc(strlen(nm)+1)))
- abort();
- strcpy((*npp)->name, nm);
+ (*npp)->name = nmem_strdup(mem, nm);
(*npp)->next = 0;
npp = &(*npp)->next;
nm = e;
}
else if (!strcmp(cmd, "name"))
{
- char name[512];
-
- if (!sscanf(args, "%s", name))
+ if (argc != 2)
{
- logf(LOG_WARN, "%s malformed name directive in %s", file);
- fclose(f);
- return 0;
+ logf(LOG_WARN, "%s:%d: Bad # args to name", file, lineno);
+ continue;
}
- if (!(res->name = xmalloc(strlen(args)+1)))
- abort();
- strcpy(res->name, name);
+ res->name = nmem_strdup(mem, argv[1]);
}
else if (!strcmp(cmd, "reference"))
{
- char name[512];
-
- if (!sscanf(args, "%s", name))
+ char *name;
+
+ if (argc != 2)
{
- logf(LOG_WARN, "%s malformed reference directive in %s", file);
- fclose(f);
- return 0;
+ logf(LOG_WARN, "%s:%d: Bad # args to reference", file, lineno);
+ continue;
}
+ name = argv[1];
if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
{
- logf(LOG_WARN, "Unknown tagset ref '%s' in %s", name, file);
- fclose(f);
- return 0;
+ logf(LOG_WARN, "%s:%d: Unknown tagset ref '%s'",
+ file, lineno, name);
+ continue;
}
}
else if (!strcmp(cmd, "type"))
{
- if (!sscanf(args, "%d", &res->type))
+ if (argc != 2)
{
- logf(LOG_WARN, "%s malformed type directive in %s", file);
- fclose(f);
- return 0;
+ logf (LOG_WARN, "%s:%d: Bad # args to type", file, lineno);
+ continue;
}
+ if (!res->type)
+ res->type = atoi(argv[1]);
}
else if (!strcmp(cmd, "include"))
{
- char name[512];
+ char *name;
+ int type = 0;
- if (!sscanf(args, "%s", name))
+ if (argc < 2)
{
- logf(LOG_WARN, "%s malformed reference directive in %s", file);
- fclose(f);
- return 0;
+ logf(LOG_WARN, "%s:%d: Bad # args to include",
+ file, lineno);
+ continue;
}
- if (!(*childp = data1_read_tagset(name)))
+ name = argv[1];
+ if (argc == 3)
+ type = atoi(argv[2]);
+ *childp = data1_read_tagset (dh, name, type);
+ if (!(*childp))
{
- logf(LOG_WARN, "Inclusion failed in %s", file);
- fclose(f);
- return 0;
+ logf(LOG_WARN, "%s:%d: Inclusion failed for tagset %s",
+ file, lineno, name);
+ continue;
}
childp = &(*childp)->next;
}
else
{
- logf(LOG_WARN, "Unknown directive '%s' in %s", cmd, file);
- fclose(f);
- return 0;
+ logf(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ file, lineno, cmd);
}
}
+ fclose(f);
+ return res;
}
projects / yaz-moved-to-github.git / blobdiff