X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=retrieval%2Fd1_doespec.c;h=29a6df48adf816980e8e40cf5bed06df327e1c91;hb=bf4149c63ad2e11429e302a89f472de52b4d7ce8;hp=31f357f8c78d3d43c22f1fa98ead0d75a4c3d9ab;hpb=bc33b8b53697bcc10a02f7e7456fd75b2c3473ef;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_doespec.c b/retrieval/d1_doespec.c
index 31f357f..29a6df4 100644
--- a/retrieval/d1_doespec.c
+++ b/retrieval/d1_doespec.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_doespec.c,v $
- * Revision 1.5  1996-07-06 19:58:34  quinn
+ * Revision 1.8  1997-05-14 06:54:02  adam
+ * C++ support.
+ *
+ * Revision 1.7  1997/04/30 08:52:11  quinn
+ * Null
+ *
+ * Revision 1.6  1996/10/11  11:57:22  quinn
+ * Smallish
+ *
+ * Revision 1.5  1996/07/06  19:58:34  quinn
  * System headerfiles gathered in yconfig
  *
  * Revision 1.4  1996/06/07  11:04:32  quinn
@@ -42,7 +51,7 @@ static int match_children_wildpath(data1_node *n, Z_Espec1 *e, int i,
  * triple with an unknown set.
  */
 static Z_Triple *find_triple(Z_Variant *var, oid_value universalset,
-    oid_value set, int class, int type)
+    oid_value set, int zclass, int type)
 {
     int i;
     oident *defaultsetent = oid_getentbyoid(var->globalVariantSetId);
@@ -56,7 +65,7 @@ static Z_Triple *find_triple(Z_Variant *var, oid_value universalset,
 	oid_value curset = cursetent ? cursetent->value : defaultset;
 
 	if (set == curset &&
-	    *var->triples[i]->class == class &&
+	    *var->triples[i]->zclass == zclass &&
 	    *var->triples[i]->type == type)
 	    return var->triples[i];
     }
@@ -196,8 +205,9 @@ static int match_children_here(data1_node *n, Z_Espec1 *e, int i,
 		 * have we looked at enough children?
 		 */
 		if (!occur || (occur->which == Z_Occurrences_values &&
+		    (!occur->u.values->howMany ||
 		    counter - *occur->u.values->start >=
-		    *occur->u.values->howMany - 1))
+		    *occur->u.values->howMany - 1)))
 		    return hits;
 	    }
 	}