New result set model and modular ranking system. Moved towards

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

diff --git a/index/attribute.c b/index/attribute.c
index 7595591..3548f3a 100644 (file)
--- a/index/attribute.c
+++ b/index/attribute.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: attribute.c,v $
- * Revision 1.6  1997-09-17 12:19:11  adam
+ * 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
  * Zebra version corresponds to YAZ version 1.4.
  * Changed Zebra server so that it doesn't depend on global common_resource.
  *
@@ -36,7 +43,7 @@
 static void att_loadset(void *p, const char *n, const char *name)
 {
     data1_attset *cnew;
-    ZServerInfo *zi = p;
+    ZebraHandle zi = p;
 
     if (!(cnew = data1_read_attset(zi->dh, (char*) name)))
     {
@@ -47,7 +54,7 @@ static void att_loadset(void *p, const char *n, const char *name)
     zi->registered_sets = cnew;
 }
 
-static void load_atts(ZServerInfo *zi)
+static void load_atts(ZebraHandle zi)
 {
     res_trav(zi->res, "attset", zi, att_loadset);
 }
@@ -69,7 +76,7 @@ static data1_att *getatt(data1_attset *p, int att)
     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;
@@ -77,11 +84,13 @@ int att_getentbyatt(ZServerInfo *zi, attent *res, oid_value set, int att)
     if (!zi->registered_sets)
        load_atts(zi);
     for (p = zi->registered_sets; p; p = p->next)
-       if (p->reference == set && (r = getatt(p, att)))
-           break;;
+       if (p->reference == set)
+           break;
     if (!p)
-       return 0;
+       return -2;
+    if (!(r = getatt(p, att)))
+       return -1;
     res->attset_ordinal = r->parent->ordinal;
     res->local_attributes = r->locals;
-    return 1;
+    return 0;
 }