X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fattribute.c;h=305ab8c7c8e633f4708ba1a0db825c706f77899f;hb=527dab66d9847bb7f8a931c558306a070064bf25;hp=59ae622e30284a4120b07f955bdc52ec767d7632;hpb=cb1402d1cc3fdc321a04a891c04b13cf9747ae0d;p=idzebra-moved-to-github.git

diff --git a/index/attribute.c b/index/attribute.c
index 59ae622..305ab8c 100644
--- a/index/attribute.c
+++ b/index/attribute.c
@@ -1,5 +1,5 @@
-/* $Id: attribute.c,v 1.25 2006-06-23 11:21:38 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: attribute.c,v 1.33 2007-10-29 16:57:52 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -28,6 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <idzebra/util.h>
 #include <attrfind.h>
 #include "index.h"
+#include <yaz/oid_db.h>
 
 static data1_att *getatt(data1_attset *p, int att)
 {
@@ -45,7 +46,7 @@ static data1_att *getatt(data1_attset *p, int att)
     return 0;
 }
 
-static int att_getentbyatt(ZebraHandle zi, oid_value set, int att,
+static int att_getentbyatt(ZebraHandle zi, const Odr_oid *set, int att,
                            const char **name)
 {
     data1_att *r;
@@ -68,8 +69,8 @@ static int att_getentbyatt(ZebraHandle zi, oid_value set, int att,
 ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh,
                                   Z_AttributeList *attr_list,
                                   zinfo_index_category_t cat,
-                                  int index_type,
-                                  oid_value curAttributeSet,
+                                  const char *index_type,
+                                  const Odr_oid *curAttributeSet,
                                   int *ord)
 {
     int use_value = -1;
@@ -97,7 +98,7 @@ ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh,
         }
         if (r == -1)
         {
-            zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,  use_value);
+            zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_value);
             return ZEBRA_FAIL;
         }
     }
@@ -110,20 +111,32 @@ ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh,
                                         index_type, use_string);
     if (*ord == -1)
     {
-        if (use_value < 0)
-            zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_string);
-        else
-            zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_value);
-        return ZEBRA_FAIL;
+        /* attribute 14=1 does not issue a diagnostic even 
+           1) the attribute is numeric but listed in .att 
+           2) the use attribute is string
+        */
+        AttrType unsup;
+        int unsup_value = 0;
+        attr_init_AttrList(&unsup, attr_list, 14);
+        unsup_value = attr_find(&unsup, 0);
+
+        if (unsup_value != 1)
+        {
+            if (use_value < 0)
+                zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_string);
+            else
+                zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_value);
+            return ZEBRA_FAIL;
+        }
     }
     return ZEBRA_OK;
 }
 
 ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
                             Z_AttributesPlusTerm *zapt,
-                            int index_type,
+                            const char *index_type,
                             const char *xpath_use,
-                            oid_value curAttributeSet,
+                            const Odr_oid *curAttributeSet,
                             int *ord)
 {
     ZEBRA_RES res = ZEBRA_OK;
@@ -159,14 +172,14 @@ ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
                                             xpath_use);
         if (*ord == -1)
         {
-            yaz_log(YLOG_LOG, "zebra_apt_get_ord FAILED xpath=%s index_type=%c",
+            yaz_log(YLOG_LOG, "zebra_apt_get_ord FAILED xpath=%s index_type=%s",
                     xpath_use, index_type);
             zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, 0);
             res = ZEBRA_FAIL;
         }
         else
         {
-            yaz_log(YLOG_LOG, "zebra_apt_get_ord OK xpath=%s index_type=%c",
+            yaz_log(YLOG_LOG, "zebra_apt_get_ord OK xpath=%s index_type=%s",
                     xpath_use, index_type);
             
         }
@@ -181,20 +194,18 @@ ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh,
 {
     AttrType structure;
     int structure_value;
+
     attr_init_AttrList(&structure, sortAttributes->list, 4);
 
     *numerical = 0;
     structure_value = attr_find(&structure, 0);
     if (structure_value == 109)
         *numerical = 1;
-    
-    if (zebra_attr_list_get_ord(zh, sortAttributes->list,
-                                zinfo_index_category_sort,
-                                's', VAL_BIB1, ord)== ZEBRA_OK)
-        return ZEBRA_OK;
-    if (zebra_attr_list_get_ord(zh, sortAttributes->list,
-                                zinfo_index_category_sort,
-                                'S', VAL_BIB1, ord)== ZEBRA_OK)
+
+    if (zebra_attr_list_get_ord(
+            zh, sortAttributes->list,
+            zinfo_index_category_sort,
+            0 /* any index */, yaz_oid_attset_bib_1, ord) == ZEBRA_OK)
         return ZEBRA_OK;
     return ZEBRA_FAIL;
 }