X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_doespec.c;h=ce95f70a6675006cff4a074f28b2ed0f730f2303;hp=b75b6cd4ec9500bbd14e4687788d5f2822a8d53c;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=4478d785b7769691261005c98063b98a5a5971b3

diff --git a/data1/d1_doespec.c b/data1/d1_doespec.c
index b75b6cd..ce95f70 100644
--- a/data1/d1_doespec.c
+++ b/data1/d1_doespec.c
@@ -1,8 +1,5 @@
-/* $Id: d1_doespec.c,v 1.11 2006-08-14 10:40:06 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2010 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -20,12 +17,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+/** \file d1_doespec.c
+ *  \brief handle Z39.50 variant-1 specs
+ *   
+ *  See http://www.loc.gov/z3950/agency/defns/variant1.html
+ */
 #include <assert.h>
 #include <stdlib.h>
 
 #include <yaz/log.h>
-#include <yaz/oid.h>
 #include <yaz/proto.h>
+#include <yaz/oid_db.h>
 #include <idzebra/data1.h>
 
 static int match_children(data1_handle dh, data1_node *n,
@@ -45,23 +47,18 @@ static int match_children_wildpath(data1_handle dh, data1_node *n,
  * set is the set to look for, universal set is the set that applies to a
  * triple with an unknown set.
  */
-static Z_Triple *find_triple(Z_Variant *var, oid_value universalset,
-    oid_value set, int zclass, int type)
+static Z_Triple *find_triple(Z_Variant *var, const Odr_oid *universal_oid,
+                             const Odr_oid *var_oid, int zclass, int type)
 {
     int i;
-    oident *defaultsetent = oid_getentbyoid(var->globalVariantSetId);
-    oid_value defaultset = defaultsetent ? defaultsetent->value :
-    	universalset;
 
     for (i = 0; i < var->num_triples; i++)
     {
-	oident *cursetent =
-	    oid_getentbyoid(var->triples[i]->variantSetId);
-	oid_value curset = cursetent ? cursetent->value : defaultset;
-
-	if (set == curset &&
-	    *var->triples[i]->zclass == zclass &&
-	    *var->triples[i]->type == type)
+        const Odr_oid *cur_oid = var->triples[i]->variantSetId;
+        if (!cur_oid)
+            cur_oid = var->globalVariantSetId;
+        if (cur_oid && var_oid 
+            && !oid_oidcmp(var_oid, cur_oid) && *var->triples[i]->type == type)
 	    return var->triples[i];
     }
     return 0;
@@ -106,9 +103,9 @@ static void mark_subtree(data1_node *n, int make_variantlist, int no_data,
 }
 
 
-static void match_triple (data1_handle dh, Z_Variant *vreq,
-			  oid_value defsetval,
-			  oid_value var1, data1_node *n)
+static void match_triple(data1_handle dh, Z_Variant *vreq,
+                         const Odr_oid *def_oid,
+                         const Odr_oid *var_oid, data1_node *n)
 {
     data1_node **c;
 
@@ -127,7 +124,7 @@ static void match_triple (data1_handle dh, Z_Variant *vreq,
 	if ((*c)->u.variant.type->zclass->zclass == 4 &&
 	    (*c)->u.variant.type->type == 1)
 	{
-	    if ((r = find_triple(vreq, defsetval, var1, 4, 1)) &&
+	    if ((r = find_triple(vreq, def_oid, var_oid, 4, 1)) &&
 		(r->which == Z_Triple_internationalString))
 	    {
 		const char *string_value =
@@ -142,7 +139,7 @@ static void match_triple (data1_handle dh, Z_Variant *vreq,
 	}
 	else
 	{
-	    match_triple (dh, vreq, defsetval, var1, *c);
+	    match_triple(dh, vreq, def_oid, var_oid, *c);
 	    c = &(*c)->next;
 	}
     }
@@ -282,10 +279,8 @@ static int match_children_here (data1_handle dh, data1_node *n,
 
 		    Z_Variant *vreq =
 			e->elements[i]->u.simpleElement->variantRequest;
-		    oident *defset = oid_getentbyoid(e->defaultVariantSetId);
-		    oid_value defsetval = defset ? defset->value : VAL_NONE;
-		    oid_value var1 = oid_getvalbyname("Variant-1");
 
+                    const Odr_oid *var_oid = yaz_oid_varset_variant_1;
 		    if (!vreq)
 			vreq = e->defaultVariantRequest;
 
@@ -296,21 +291,25 @@ static int match_children_here (data1_handle dh, data1_node *n,
 			/*
 			 * 6,5: meta-data requested, variant list.
 			 */
-			if (find_triple(vreq, defsetval, var1, 6, 5))
+			if (find_triple(vreq, e->defaultVariantSetId, 
+                                        var_oid, 6, 5))
 			    show_variantlist = 1;
 			/*
 			 * 9,1: Miscellaneous, no data requested.
 			 */
-			if (find_triple(vreq, defsetval, var1, 9, 1))
+			if (find_triple(vreq, e->defaultVariantSetId,
+                                        var_oid, 9, 1))
 			    no_data = 1;
 
 			/* howmuch */
-			if ((r = find_triple(vreq, defsetval, var1, 5, 5)))
+			if ((r = find_triple(vreq, e->defaultVariantSetId,
+                                             var_oid, 5, 5)))
 			    if (r->which == Z_Triple_integer)
 				get_bytes = *r->value.integer;
 
 			if (!show_variantlist)
-			    match_triple (dh, vreq, defsetval, var1, c);
+			    match_triple(dh, vreq, e->defaultVariantSetId,
+                                         var_oid, c);
 		    }
 		    mark_subtree(c, show_variantlist, no_data, get_bytes, vreq,
 				 select_flag);
@@ -373,6 +372,7 @@ int data1_doespec1 (data1_handle dh, data1_node *n, Z_Espec1 *e)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab