* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_attset.c,v $
- * Revision 1.1 1995-11-01 11:56:07 quinn
+ * Revision 1.5 1996-05-09 07:27:43 quinn
+ * Multiple local attributes values supported.
+ *
+ * Revision 1.4 1996/02/21 15:23:36 quinn
+ * Reversed fclose and return;
+ *
+ * Revision 1.3 1995/12/13 17:14:26 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.2 1995/11/01 16:34:55 quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.1 1995/11/01 11:56:07 quinn
* Added Retrieval (data management) functions en masse.
*
*
#include <xmalloc.h>
#include <log.h>
#include <d1_attset.h>
+#include <data1.h>
+#include <tpath.h>
data1_att *data1_getattbyname(data1_attset *s, char *name)
{
{
/* scan local set */
for (r = s->atts; r; r = r->next)
- if (!strcmp(r->name, name))
+ if (!data1_matchstr(r->name, name))
return r;
/* scan included sets */
if (s->children && (r = data1_getattbyname(s->children, name)))
data1_att **attp;
FILE *f;
- if (!(f = fopen(file, "r")))
+ if (!(f = yaz_path_fopen(data1_tabpath, file, "r")))
{
logf(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;
}
if (!r)
{
- return res;
fclose(f);
+ return res;
}
if (sscanf(r, "%s %[^\n]", cmd, args) < 2)
*args = '\0';
if (!strcmp(cmd, "att"))
{
- int num, local, rr;
- char name[512];
+ int num, rr;
+ char name[512], localstr[512];
data1_att *t;
+ data1_local_attribute *locals;
- if ((rr = sscanf(args, "%d %s %d", &num, name, &local)) < 2)
+ if ((rr = sscanf(args, "%511d %s %511s", &num, name, localstr)) < 2)
{
logf(LOG_WARN, "Not enough arguments to att in '%s' in %s",
args, file);
fclose(f);
return 0;
}
- if (rr < 3)
- local = num;
+ if (rr < 3) /* no local attributes given */
+ {
+ locals = xmalloc(sizeof(*locals));
+ locals->local = num;
+ locals->next = 0;
+ }
+ else /* parse the string "local{,local}" */
+ {
+ char *p = localstr;
+ data1_local_attribute **ap = &locals;
+ do
+ {
+ *ap = xmalloc(sizeof(**ap));
+ (*ap)->local = atoi(p);
+ (*ap)->next = 0;
+ ap = &(*ap)->next;
+ }
+ while ((p = strchr(p, ',')) && *(++p));
+ }
if (!(t = *attp = xmalloc(sizeof(*t))))
abort();
t->parent = res;
abort();
strcpy(t->name, name);
t->value = num;
- t->local = local;
+ t->locals = locals;
t->next = 0;
attp = &t->next;
}