X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fattribute.c;h=78af3c15e6f407e16e4dcaa9f866cb2dd59ce523;hb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;hp=64d7035c1baa7f6256cbbaaf87069d08cb35e283;hpb=b7918920dd34b8c4c93e8d3095203e236523f453;p=idzebra-moved-to-github.git

diff --git a/index/attribute.c b/index/attribute.c
index 64d7035..78af3c1 100644
--- a/index/attribute.c
+++ b/index/attribute.c
@@ -1,4 +1,23 @@
 /*
+ * Copyright (C) 1994-1995, Index Data I/S 
+ * All rights reserved.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: attribute.c,v $
+ * 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.
  */
@@ -6,11 +25,9 @@
 #include <stdio.h>
 
 #include <log.h>
-#include <alexutil.h>
 #include <res.h>
-
-#include "d1_attset.h"
-
+#include <d1_attset.h>
+#include <zebrautl.h>
 #include "attribute.h"
 
 static int initialized = 0;
@@ -19,16 +36,15 @@ static data1_attset *registered_sets = 0;
 
 static void att_loadset(const char *n, const char *name)
 {
-    data1_attset *new;
+    data1_attset *cnew;
 
-    if (!(new = data1_read_attset((char*) name)))
+    if (!(cnew = data1_read_attset((char*) name)))
     {
 	logf(LOG_WARN|LOG_ERRNO, "%s", name);
 	return;
     }
-    new->next = registered_sets;
-    registered_sets = new;
-    return;
+    cnew->next = registered_sets;
+    registered_sets = cnew;
 }
 
 static void load_atts()
@@ -70,6 +86,6 @@ attent *att_getentbyatt(oid_value set, int att)
     if (!p)
 	return 0;
     res.attset_ordinal = r->parent->ordinal;
-    res.local_attribute = r->local;
+    res.local_attributes = r->locals;
     return &res;
 }