X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fapitest.c;h=0f44a4f91b8a8dab5074eceaa7132eb423253e0a;hp=d9cef3242ca9097db586e2828e1d7816034e7a8c;hb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;hpb=d0276ba178f8bdd1ccad216d8b4ec9af832b0cf7 diff --git a/index/apitest.c b/index/apitest.c index d9cef32..0f44a4f 100644 --- a/index/apitest.c +++ b/index/apitest.c @@ -1,9 +1,32 @@ +/* $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 -#include -#include -#include "zebraapi.h" +#include +#include +#include /* Small routine to display GRS-1 record variants ... */ /* Copied verbatim from yaz/client/client.c */ @@ -98,99 +121,126 @@ int main (int argc, char **argv) { /* odr is a handle to memory assocated with RETURNED data from various functions */ - ODR odr = odr_createmem (ODR_ENCODE); + ODR odr_input, odr_output; - /* zh is our Zebra Handle - describes the server as a whole */ + /* zs is our Zebra Service - decribes whole server */ + ZebraService zs; + + /* zh is our Zebra Handle - describes database session */ ZebraHandle zh; /* the database we specify in our example */ - char *base = "Default"; + const char *base = "Default"; int argno; + nmem_init (); + + yaz_log_init_file("apitest.log"); + + odr_input = odr_createmem (ODR_DECODE); + odr_output = odr_createmem (ODR_ENCODE); + + zs = zebra_start ("zebra.cfg"); + if (!zs) + { + printf ("zebra_start failed; missing zebra.cfg?\n"); + exit (1); + } /* open Zebra */ - zh = zebra_open ("zebra.cfg"); + zh = zebra_open (zs); if (!zh) { - printf ("Couldn't init zebra\n"); + printf ("zebras_open failed\n"); exit (1); } - - /* This call controls the logging facility in YAZ/Zebra */ -#if 0 - log_init(LOG_ALL, "", "out.log"); -#endif - + zebra_select_databases (zh, 1, &base); /* Each argument to main will be a query */ for (argno = 1; argno < argc; argno++) { /* parse the query and generate an RPN structure */ - Z_RPNQuery *query = p_query_rpn (odr, PROTO_Z3950, argv[argno]); + Z_RPNQuery *query = p_query_rpn (odr_input, PROTO_Z3950, argv[argno]); char setname[64]; int errCode; int i; - const char *errString; - char *errAdd; + int hits; + char *errString; ZebraRetrievalRecord *records; int noOfRecordsToFetch; /* bad query? */ if (!query) { - logf (LOG_WARN, "bad query %s\n", argv[argno]); - odr_reset (odr); + yaz_log (YLOG_WARN, "bad query %s\n", argv[argno]); + odr_reset (odr_input); continue; } + else + { + char out_str[100]; + int r; +#if 1 + r = zebra_string_norm (zh, 'w', + argv[argno], strlen(argv[argno]), + out_str, sizeof(out_str)); + if (r >= 0) + { + printf ("norm: '%s'\n", out_str); + } + else + { + printf ("norm fail: %d\n", r); + } +#endif + } /* result set name will be called 1,2, etc */ - sprintf (setname, "%d", i); + sprintf (setname, "%d", argno); /* fire up the search */ - zebra_search_rpn (zh, odr, query, 1, &base, setname); + zebra_search_RPN (zh, odr_input, query, setname, &hits); /* status ... */ - errCode = zebra_errCode (zh); - errString = zebra_errString (zh); - errAdd = zebra_errAdd (zh); + zebra_result (zh, &errCode, &errString); /* error? */ if (errCode) { - printf ("Zebra Search Error %d %s %s\n", - errCode, errString, errAdd ? errAdd : ""); + printf ("Zebra Search Error %d %s\n", + errCode, errString); continue; } /* ok ... */ - printf ("Zebra Search gave %d hits\n", zebra_hits (zh)); + printf ("Zebra Search gave %d hits\n", hits); /* Deterimine number of records to fetch ... */ - if (zebra_hits(zh) > 10) + if (hits > 10) noOfRecordsToFetch = 10; else - noOfRecordsToFetch = zebra_hits(zh); + noOfRecordsToFetch = hits; /* reset our memory - we've finished dealing with search */ - odr_reset (odr); + odr_reset (odr_input); + odr_reset (odr_output); /* prepare to fetch ... */ - records = malloc (sizeof(*records) * noOfRecordsToFetch); + records = odr_malloc (odr_input, sizeof(*records) * noOfRecordsToFetch); /* specify position of each record to fetch */ /* first one is numbered 1 and NOT 0 */ for (i = 0; i