X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft4.c;h=fb1d82bbce692116f60186aa4a253649cf9fe02f;hb=6cb032fd2ece4742e3516e0941507143f677e5cd;hp=db76d627569e1dbf809c432f23f11357885a1fa6;hpb=9af25502b9e14213d1d44e99e38f752c3a174b44;p=idzebra-moved-to-github.git

diff --git a/test/api/t4.c b/test/api/t4.c
index db76d62..fb1d82b 100644
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,6 +1,6 @@
-/* $Id: t4.c,v 1.13 2004-12-02 11:28:20 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: t4.c,v 1.17 2005-05-11 12:39:37 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -30,17 +30,24 @@ const char *myrec[] = {
         "</gils>\n",
         0};
 	
+#define NUMBER_TO_FETCH_MAX 1000
+
 int main(int argc, char **argv)
 {
     int i;
+    int number_to_be_inserted = 5;
+    int number_to_fetch = 5;
+
     ZebraService zs = start_up(0, argc, argv);
     ZebraHandle zh = zebra_open(zs);
 
     init_data(zh, myrec);
 
     zebra_begin_trans (zh, 1);
-    for (i = 0; i<1200; i++)
+    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]));
+    }
     zebra_end_trans(zh);
     zebra_close(zh);
     zebra_stop(zs);
@@ -48,21 +55,34 @@ int main(int argc, char **argv)
     zs = start_service("");
     zh = zebra_open(zs);
     zebra_select_database(zh, "Default");
+    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);    
         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);
 
@@ -70,13 +90,33 @@ int main(int argc, char **argv)
 
         zebra_begin_trans(zh, 1);
 
-	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);
 
         zebra_end_trans(zh);