X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ft4.c;h=85a57ab68dd8bc7670ae7427766a8b9d0d4f42ef;hp=4ee95db0e227048de068060b6aa1d4355c6e7804;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=4989a5fc444f3bca0f094f1ac2bfe4f04af5e666

diff --git a/test/api/t4.c b/test/api/t4.c
index 4ee95db..85a57ab 100644
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,6 +1,6 @@
-/* $Id: t4.c,v 1.10 2004-10-28 15:24:36 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t4.c,v 1.20 2006-05-10 08:13:35 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,81 +20,120 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <idzebra/api.h>
+/* t4 - insert a small pile of records, search and fetch them */
+
 #include "testlib.h"
 
-	
-int main(int argc, char **argv)
-{
-    int i;
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec[] = {
+const char *myrec[] = {
         "<gils>\n"
         "  <title>My title</title>\n"
         "</gils>\n",
         0};
+	
+#define NUMBER_TO_FETCH_MAX 1000
+
+static void tst(int argc, char **argv)
+{
+    int i;
+    int number_to_be_inserted = 5;
+    int number_to_fetch = 5;
+
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
 
-    yaz_log_init_file("t4.log");
+    YAZ_CHECK(tl_init_data(zh, myrec));
 
-    nmem_init ();
-    
-    zs = start_service(0);
-    zh = zebra_open (zs);
-    init_data(zh,myrec);
+    YAZ_CHECK(zebra_begin_trans (zh, 1) == ZEBRA_OK);
+
+    for (i = 0; i< number_to_be_inserted-1; i++)
+    {  /* -1 since already inserted one in init_data */
+	zebra_add_record(zh, myrec[0], strlen(myrec[0]));
+    }
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
 
-    zebra_begin_trans (zh, 1);
-    for (i = 0; i<1200; i++)
-	zebra_add_record (zh, myrec[0], strlen(myrec[0]));
-    zebra_end_trans (zh);
     zebra_close(zh);
     zebra_stop(zs);
 
-    zs = start_service("");
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
+    zs = tl_zebra_start("");
+    zh = zebra_open(zs, 0);
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
+    zebra_set_resource(zh, "sortmax", "3"); /* make small sort boundary */
 
     for (i = 0; i<2; i++)
     {
-        ZebraRetrievalRecord retrievalRecord[1001];
+	ZEBRA_RES ret;
+        ZebraRetrievalRecord retrievalRecord[NUMBER_TO_FETCH_MAX];
         char setname[20];
         int j;
-        ODR odr_input = odr_createmem (ODR_DECODE);    
-        ODR odr_output = odr_createmem (ODR_DECODE);    
+        ODR odr_input = odr_createmem(ODR_DECODE);    
+        ODR odr_output = odr_createmem(ODR_DECODE);    
         YAZ_PQF_Parser parser = yaz_pqf_create();
-        Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input, 
-                                          "@attr 1=4 my");
-        int hits;
+        Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input, "@attr 1=4 my");
+        zint hits;
         
         sprintf(setname, "s%d", i+1);
-        zebra_search_RPN (zh, odr_input, query, setname, &hits);
+        ret = zebra_search_RPN(zh, odr_input, query, setname, &hits);
+	if (ret != ZEBRA_OK)
+	{
+	    int code = zebra_errCode(zh);
+	    yaz_log(YLOG_WARN, "Unexpected error code=%d", code);
+	    exit(1);
+	}
+	if (hits != number_to_be_inserted)
+	{
+	    yaz_log(YLOG_WARN, "Unexpected hit count " ZINT_FORMAT 
+		    "(should be %d)", hits, number_to_be_inserted);
+	    exit(1);
+	}
 
         yaz_pqf_destroy(parser);
 
-        odr_destroy (odr_input);
+        odr_destroy(odr_input);
 
-        zebra_begin_trans (zh, 1);
+        YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
 
-	for (j = 0; j<1001; j++)
+	for (j = 0; j < number_to_fetch; j++)
 	    retrievalRecord[j].position = j+1;
 
-        zebra_records_retrieve (zh, odr_output, setname, 0,
-                                VAL_TEXT_XML, 1001, retrievalRecord);
-
+        ret = zebra_records_retrieve(zh, odr_output, setname, 0,
+				     VAL_TEXT_XML, number_to_fetch,
+				     retrievalRecord);
+	if (ret != ZEBRA_OK)
+	{
+	    int code = zebra_errCode(zh);
+	    yaz_log(YLOG_FATAL, "zebra_records_retrieve returned error %d",
+		    code);
+	    exit(1);
+	}
+	
+	for (j = 0; j < number_to_fetch; j++)
+	{
+	    if (!retrievalRecord[j].buf)
+	    {
+		yaz_log(YLOG_FATAL, "No record buf at position %d", j);
+		exit(1);
+	    }
+	    if (!retrievalRecord[j].len)
+	    {
+		yaz_log(YLOG_FATAL, "No record len at position %d", j);
+		exit(1);
+	    }
+	}
+        odr_destroy(odr_output);
+
+        YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
+    }
+    zebra_commit(zh);
+    YAZ_CHECK(tl_close_down(zh, zs));
+}
 
-        odr_destroy (odr_output);
+TL_MAIN
 
-        zebra_end_trans (zh);
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
 
-    }
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
-
-    nmem_exit ();
-    xmalloc_trav ("x");
-    logf(LOG_LOG,"================ All tests OK ");
-    exit (0);
-}