using yaz/log.h again

[idzebra-moved-to-github.git] / index / apitest.c

diff --git a/index/apitest.c b/index/apitest.c
index 9bfe1af..0f44a4f 100644 (file)
--- a/index/apitest.c
+++ b/index/apitest.c
@@ -1,15 +1,32 @@
-/*
- * 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.19 2004-12-13 20:51:30 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   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 <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 */
@@ -153,7 +170,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 +197,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);