/*
+ * Copyright (C) 1994-1997, Index Data I/S
+ * All rights reserved.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: attribute.c,v $
+ * Revision 1.7 1997-10-29 12:05:01 adam
+ * Server produces diagnostic "Unsupported Attribute Set" when appropriate.
+ *
+ * Revision 1.6 1997/09/17 12:19:11 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.5 1997/09/05 15:30:08 adam
+ * Changed prototype for chr_map_input - added const.
+ * Added support for C++, headers uses extern "C" for public definitions.
+ *
+ * Revision 1.4 1996/10/29 14:06:48 adam
+ * Include zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.3 1996/05/09 07:28:54 quinn
+ * Work towards phrases and multiple registers
+ *
+ * Revision 1.2 1995/11/15 19:13:07 adam
+ * Work on record management.
+ *
+ *
* This interface is used by other modules (the Z-server in particular)
* to normalize the attributes given in queries.
*/
#include <stdio.h>
#include <log.h>
-#include <alexutil.h>
#include <res.h>
+#include <zebrautl.h>
+#include "zserver.h"
-#include "d1_attset.h"
-
-#include "attribute.h"
-
-static int initialized = 0;
-
-static data1_attset *registered_sets = 0;
-
-static void att_loadset(const char *n, const char *name)
+static void att_loadset(void *p, const char *n, const char *name)
{
- data1_attset *new;
+ data1_attset *cnew;
+ ZServerInfo *zi = p;
- if (!(new = data1_read_attset((char*) name)))
+ if (!(cnew = data1_read_attset(zi->dh, (char*) name)))
{
logf(LOG_WARN|LOG_ERRNO, "%s", name);
return;
}
- new->next = registered_sets;
- registered_sets = new;
- return;
+ cnew->next = zi->registered_sets;
+ zi->registered_sets = cnew;
}
-static void load_atts()
+static void load_atts(ZServerInfo *zi)
{
- res_trav(common_resource, "attset", att_loadset);
+ res_trav(zi->res, "attset", zi, att_loadset);
}
static data1_att *getatt(data1_attset *p, int att)
return 0;
}
-attent *att_getentbyatt(oid_value set, int att)
+int att_getentbyatt(ZServerInfo *zi, attent *res, oid_value set, int att)
{
- static attent res;
data1_att *r;
data1_attset *p;
- if (!initialized)
- {
- initialized = 1;
- load_atts();
- }
- for (p = registered_sets; p; p = p->next)
- if (p->reference == set && (r = getatt(p, att)))
+ if (!zi->registered_sets)
+ load_atts(zi);
+ for (p = zi->registered_sets; p; p = p->next)
+ if (p->reference == set)
break;;
if (!p)
- return 0;
- res.attset_ordinal = r->parent->ordinal;
- res.local_attribute = r->local;
- return &res;
+ return -2;
+ if (!(r = getatt(p, att)))
+ return -1;
+ res->attset_ordinal = r->parent->ordinal;
+ res->local_attributes = r->locals;
+ return 0;
}