X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=72741309706d80629bd42aec0989bd0700465db5;hb=1e5554fc59c8cad2105b2a8cf095d13315dc6ed1;hp=a021b649f02ee1f849080830677da475def93f32;hpb=eb14cf14b5b176a8e2b73ca251d625e47223f116;p=yaz-moved-to-github.git

diff --git a/ztest/ztest.c b/ztest/ztest.c
index a021b64..7274130 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2002, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: ztest.c,v 1.52 2002-03-18 21:33:48 adam Exp $
+ * $Id: ztest.c,v 1.56 2003-02-28 15:59:02 adam Exp $
  */
 
 /*
@@ -13,12 +13,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <yaz/yaz-util.h>
 #include <yaz/backend.h>
-#include <yaz/log.h>
-
-#if YAZ_MODULE_ill
 #include <yaz/ill.h>
-#endif
 
 Z_GenericRecord *dummy_grs_record (int num, ODR o);
 char *dummy_marc_record (int num, ODR odr);
@@ -37,7 +34,7 @@ int ztest_search (void *handle, bend_search_rr *rr)
         rr->errcode = 23;
         return 0;
     }
-    if (strcmp (rr->basenames[0], "Default"))
+    if (yaz_matchstr (rr->basenames[0], "Default"))
     {
         rr->errcode = 109;
         rr->errstring = rr->basenames[0];
@@ -99,7 +96,6 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
 		yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId);
 		yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item);
 	    }
-#if YAZ_MODULE_ill
 	    if (n->itemRequest)
 	    {
 		Z_External *r = (Z_External*) n->itemRequest;
@@ -177,7 +173,6 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
 			     *item_req->protocol_version_num);
 		}
 	    }
-#endif
             if (k)
             {
 
@@ -603,7 +598,8 @@ int ztest_scan(void *handle, bend_scan_rr *q)
 
 bend_initresult *bend_init(bend_initrequest *q)
 {
-    bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
+    bend_initresult *r = (bend_initresult *)
+        odr_malloc (q->stream, sizeof(*r));
     int *counter = (int *) xmalloc (sizeof(int));
 
     *counter = 0;