X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fapitest.c;h=d655f92ba1befb430aa33a3428472cb923af918c;hp=9bfe1af18e8056e77b88ebec206fe185c850e9d5;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=2b1851bd5565e3d21f9cf9a37661a584c063b75f

diff --git a/index/apitest.c b/index/apitest.c
index 9bfe1af..d655f92 100644
--- a/index/apitest.c
+++ b/index/apitest.c
@@ -1,15 +1,31 @@
-/*
- * Copyright (C) 1995-2000, Index Data
- * All rights reserved.
- *
- * $Header: /home/cvsroot/idis/index/Attic/apitest.c,v 1.11 2002-04-04 14:14:13 adam Exp $
- */
+/* $Id: apitest.c,v 1.25 2006-05-10 08:13:20 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <yaz/log.h>
 #include <yaz/pquery.h>
-#include "zebraapi.h"
+#include <idzebra/api.h>
 
 /* Small routine to display GRS-1 record variants ... */
 /* Copied verbatim from yaz/client/client.c */
@@ -130,13 +146,17 @@ int main (int argc, char **argv)
 	exit (1);
     }
     /* open Zebra */
-    zh = zebra_open (zs);
+    zh = zebra_open (zs, 0);
     if (!zh)
     {
 	printf ("zebras_open failed\n");
 	exit (1);
     }
-    zebra_select_databases (zh, 1, &base);
+    if (zebra_select_databases (zh, 1, &base) != ZEBRA_OK)
+    {
+	printf ("zebra_select_databases failed\n");
+	exit (1);
+    }
     /* Each argument to main will be a query */
     for (argno = 1; argno < argc; argno++)
     {
@@ -145,7 +165,7 @@ int main (int argc, char **argv)
 	char setname[64];
 	int errCode;
 	int i;
-        int hits;
+        zint hits;
 	char *errString;
 	ZebraRetrievalRecord *records;
 	int noOfRecordsToFetch;
@@ -153,7 +173,7 @@ int main (int argc, char **argv)
 	/* bad query? */
 	if (!query)
 	{
-	    logf (LOG_WARN, "bad query %s\n", argv[argno]);
+	    yaz_log (YLOG_WARN, "bad query %s\n", argv[argno]);
 	    odr_reset (odr_input);
 	    continue;
 	}
@@ -180,7 +200,7 @@ int main (int argc, char **argv)
 	sprintf (setname, "%d", argno);
 
 	/* fire up the search */
-	zebra_search_rpn (zh, odr_input, odr_output, query, setname, &hits);
+	zebra_search_RPN (zh, odr_input, query, setname, &hits);
 	
 	/* status ... */
         zebra_result (zh, &errCode, &errString);
@@ -193,7 +213,7 @@ int main (int argc, char **argv)
 	    continue;
 	}
 	/* ok ... */
-	printf ("Zebra Search gave %d hits\n", hits);
+	printf ("Zebra Search gave " ZINT_FORMAT " hits\n", hits);
 	
 	/* Deterimine number of records to fetch ... */
 	if (hits > 10)
@@ -267,3 +287,11 @@ int main (int argc, char **argv)
     zebra_stop (zs);
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+