Updated WIN32 code specific sections. Changed header.

[idzebra-moved-to-github.git] / index / attribute.c

diff --git a/index/attribute.c b/index/attribute.c
index fb15f20..bc60c86 100644 (file)
--- a/index/attribute.c
+++ b/index/attribute.c
@@ -1,10 +1,21 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: attribute.c,v $
- * Revision 1.7  1997-10-29 12:05:01  adam
+ * Revision 1.10  1999-02-02 14:50:49  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.9  1998/05/20 10:12:14  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.8  1998/03/05 08:45:11  adam
+ * New result set model and modular ranking system. Moved towards
+ * descent server API. System information stored as "SGML" records.
+ *
+ * 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
@@ -36,57 +47,37 @@
 #include <zebrautl.h>
 #include "zserver.h"
 
-static void att_loadset(void *p, const char *n, const char *name)
-{
-    data1_attset *cnew;
-    ZServerInfo *zi = p;
-
-    if (!(cnew = data1_read_attset(zi->dh, (char*) name)))
-    {
-       logf(LOG_WARN|LOG_ERRNO, "%s", name);
-       return;
-    }
-    cnew->next = zi->registered_sets;
-    zi->registered_sets = cnew;
-}
-
-static void load_atts(ZServerInfo *zi)
-{
-    res_trav(zi->res, "attset", zi, att_loadset);
-}
-
 static data1_att *getatt(data1_attset *p, int att)
 {
     data1_att *a;
+    data1_attset_child *c;
 
-    for (; p; p = p->next)
-    {
-       /* scan local set */
-       for (a = p->atts; a; a = a->next)
-           if (a->value == att)
-               return a;
-       /* scan included sets */
-       if (p->children && (a = getatt(p->children, att)))
+    /* scan local set */
+    for (a = p->atts; a; a = a->next)
+       if (a->value == att)
+           return a;
+    /* scan included sets */
+    for (c = p->children; c; c = c->next)
+       if ((a = getatt(c->child, att)))
            return a;
-    }
     return 0;
 }
 
-int att_getentbyatt(ZServerInfo *zi, attent *res, oid_value set, int att)
+int att_getentbyatt(ZebraHandle zi, attent *res, oid_value set, int att)
 {
     data1_att *r;
     data1_attset *p;
 
-    if (!zi->registered_sets)
-       load_atts(zi);
-    for (p = zi->registered_sets; p; p = p->next)
-       if (p->reference == set)
-           break;;
+    if (!(p = data1_attset_search_id (zi->dh, set)))
+    {
+       zebraExplain_loadAttsets (zi->dh, zi->res);
+       p = data1_attset_search_id (zi->dh, set);
+    }
     if (!p)
        return -2;
     if (!(r = getatt(p, att)))
        return -1;
-    res->attset_ordinal = r->parent->ordinal;
+    res->attset_ordinal = r->parent->reference;
     res->local_attributes = r->locals;
     return 0;
 }