X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=8a112399304583ab2a3c8573bf87290493fe90a2;hp=fe1ecc111879261dedb98515c13273525d36b128;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f

diff --git a/test/api/testlib.c b/test/api/testlib.c
index fe1ecc1..8a11239 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,8 +1,5 @@
-/* $Id: testlib.c,v 1.30 2006-03-31 15:58:05 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 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
@@ -15,9 +12,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 /** testlib - utilities for the api tests */
@@ -35,33 +32,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <yaz/log.h>
 #include <yaz/pquery.h>
+#include <yaz/oid_db.h>
 #include <idzebra/api.h>
 #include "testlib.h"
 
-/** start_log: open a log file */
-/*    FIXME - parse command line arguments to set log levels etc */
-int log_level=0; /* not static, t*.c may use it */
-
-void tl_start_log(int argc, char **argv)
-{
-    int cmd_level = 0;
-    char logname[2048];
-    if (!argv) 
-        return;
-    if (!argv[0])
-        return;
-    sprintf(logname, "%s.log", argv[0]);
-    yaz_log_init_file(logname);
-    log_level = yaz_log_mask_str_x(argv[0], 0);
-    if (argc >= 2)
-	cmd_level |= yaz_log_mask_str_x(argv[1], 0);
-    yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level | cmd_level);
-    yaz_log(log_level, "starting %s", argv[0]);
-}
+int log_level = YLOG_LOG;
 
-/** 
+/* 
  * tl_start_up : do common start things, and a zebra_start
- *    - nmem_init
  *    - build the name of logfile from argv[0], and open it
  *      if no argv passed, do not open a log
  *    - read zebra.cfg from env var srcdir if it exists; otherwise current dir 
@@ -72,20 +50,18 @@ ZebraService tl_start_up(char *cfgname, int argc, char **argv)
 #if HAVE_SYS_RESOURCE_H
 #if HAVE_SYS_TIME_H
     struct rlimit rlim;
-    rlim.rlim_cur = 20;
-    rlim.rlim_max = 20;
+    rlim.rlim_cur = 60;
+    rlim.rlim_max = 60;
     setrlimit(RLIMIT_CPU, &rlim);
 #endif
 #endif
-    nmem_init();
-    tl_start_log(argc, argv);
     return tl_zebra_start(cfgname);
 }
 
 /**
  * get_srcdir: return env srcdir or . (if does does not exist)
  */
-const char *tl_get_srcdir()
+const char *tl_get_srcdir(void)
 {
     const char *srcdir = getenv("srcdir");
     if (!srcdir || ! *srcdir)
@@ -113,7 +89,6 @@ int tl_close_down(ZebraHandle zh, ZebraService zs)
     if (zs)
         zebra_stop(zs);
 
-    nmem_exit();
     xmalloc_trav("x");
     return 1;
 }
@@ -144,7 +119,14 @@ int tl_init_data(ZebraHandle zh, const char **recs)
 	if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
 	    return 0;
         for (i = 0; recs[i]; i++)
-            zebra_add_record(zh, recs[i], strlen(recs[i]));
+        {
+            if (zebra_add_record(zh, recs[i], strlen(recs[i])) != ZEBRA_OK)
+            {
+                if (zebra_end_trans(zh) != ZEBRA_OK)
+                    return 0;
+                return 0;
+            }
+        }
         if (zebra_end_trans(zh) != ZEBRA_OK)
 	    return 0;
         zebra_commit(zh);
@@ -172,11 +154,14 @@ int tl_query_x(ZebraHandle zh, const char *query, zint exphits, int experror)
     yaz_pqf_destroy(parser);
     if (!rpn)
     {
+        yaz_log(log_level, "could not parse pqf query %s\n", query);
+        printf("could not parse pqf query %s\n", query);
 	odr_destroy(odr);
 	return 0;
     }
 
     rc = zebra_search_RPN(zh, odr, rpn, setname, &hits);
+    odr_destroy(odr);
     if (experror)
     {
 	int code;
@@ -219,7 +204,6 @@ int tl_query_x(ZebraHandle zh, const char *query, zint exphits, int experror)
 	    return 0;
 	}
     }
-    odr_destroy(odr);
     return 1;
 }
 
@@ -234,6 +218,7 @@ int tl_scan(ZebraHandle zh, const char *query,
 	    int exp_pos, int exp_num, int exp_partial,
 	    const char **exp_entries)
 {
+    int ret = 1;
     ODR odr = odr_createmem(ODR_ENCODE);
     ZebraScanEntry *entries = 0;
     int partial = -123;
@@ -244,61 +229,71 @@ int tl_scan(ZebraHandle zh, const char *query,
 
     res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial, 
 			 0 /* setname */);
-    if (res != ZEBRA_OK)
+
+    if (partial == -123)
     {
-	printf("Error: scan returned %d (FAIL), but no error was expected\n"
-	       "%s\n",  res, query);
-	return 0;
+        printf("Error: scan returned OK, but partial was not set\n"
+               "%s\n", query);
+        ret = 0;
+    }
+    if (partial != exp_partial)
+    {
+        printf("Error: scan OK, with partial/expected %d/%d\n",
+               partial, exp_partial);
+        ret = 0;
+    }
+    if (res != ZEBRA_OK) /* failure */
+    {
+        if (exp_entries)
+        {
+            printf("Error: scan failed, but no error was expected\n");
+            ret = 0;
+        }
     }
     else
     {
-	int fails = 0;
-	if (partial == -123)
-	{
-	    printf("Error: scan returned OK, but partial was not set\n"
-		   "%s\n", query);
-	    fails++;
-	}
-	if (partial != exp_partial)
-	{
-	    printf("Error: scan returned OK, with partial/expected %d/%d\n"
-		   "%s\n", partial, exp_partial, query);
-	    fails++;
-	}
-	if (num != exp_num)
-	{
-	    printf("Error: scan returned OK, with num/expected %d/%d\n"
-		   "%s\n", num, exp_num, query);
-	    fails++;
-	}
-	if (pos != exp_pos)
-	{
-	    printf("Error: scan returned OK, with pos/expected %d/%d\n"
-		   "%s\n", pos, exp_pos, query);
-	    fails++;
-	}
-	if (fails)
-	    return 0;
-	fails = 0;
-	if (exp_entries)
-	{
-	    int i;
-	    for (i = 0; i<num; i++)
-	    {
-		if (strcmp(exp_entries[i], entries[i].term))
-		{
-		    printf("Error: scan OK, but entry %d term/exp %s/%s\n"
-			   "%s\n",
-			   i, entries[i].term, exp_entries[i], query);
-		    fails++;
-		}
-	    }
-	}
-	if (fails)
-	    return 0;
+        if (!exp_entries)
+        {
+            printf("Error: scan OK, but error was expected\n");
+            ret = 0;
+        }
+        else
+        {
+            int fails = 0;
+            if (num != exp_num)
+            {
+                printf("Error: scan OK, with num/expected %d/%d\n",
+                       num, exp_num);
+                fails++;
+            }
+            if (pos != exp_pos)
+            {
+                printf("Error: scan OK, with pos/expected %d/%d\n",
+                       pos, exp_pos);
+                fails++;
+            }
+            if (!fails)
+            {
+                if (exp_entries)
+                {
+                    int i;
+                    for (i = 0; i<num; i++)
+                    {
+                        if (strcmp(exp_entries[i], entries[i].term))
+                        {
+                            printf("Error: scan OK of %s, no %d got=%s exp=%s\n",
+                                   query, i, entries[i].term, exp_entries[i]);
+                            fails++;
+                        }
+                    }
+                }
+            }
+            if (fails)
+                ret = 0;
+        }
     }
     odr_destroy(odr);
-    return 1;
+    return ret;
 }
 
 /** 
@@ -309,10 +304,11 @@ int tl_ranking_query(ZebraHandle zh, char *query,
 		     int exphits, char *firstrec, int firstscore)
 {
     ZebraRetrievalRecord retrievalRecord[10];
-    ODR odr_output = odr_createmem (ODR_ENCODE);    
-    const char *setname="rsetname";
+    ODR odr_output = 0;
+    const char *setname = "rsetname";
     int rc;
     int i;
+    int ret = 1;
         
     if (!tl_query(zh, query, exphits))
 	return 0;
@@ -320,49 +316,49 @@ int tl_ranking_query(ZebraHandle zh, char *query,
     for (i = 0; i<10; i++)
         retrievalRecord[i].position = i+1;
 
-    rc = zebra_records_retrieve (zh, odr_output, setname, 0,
-				 VAL_TEXT_XML, exphits, retrievalRecord);
+    odr_output = odr_createmem(ODR_ENCODE);    
+    rc = zebra_records_retrieve(zh, odr_output, setname, 0,
+                                yaz_oid_recsyn_xml, exphits, retrievalRecord);
     if (rc != ZEBRA_OK)
-	return 0;
-
-    if (!strstr(retrievalRecord[0].buf, firstrec))
+        ret = 0;
+    else if (!strstr(retrievalRecord[0].buf, firstrec))
     {
         printf("Error: Got the wrong record first\n");
         printf("Expected '%s' but got\n", firstrec);
         printf("%.*s\n", retrievalRecord[0].len, retrievalRecord[0].buf);
-	return 0;
+        ret = 0;
     }
-    
-    if (retrievalRecord[0].score != firstscore)
+    else if (retrievalRecord[0].score != firstscore)
     {
         printf("Error: first rec got score %d instead of %d\n",
 	       retrievalRecord[0].score, firstscore);
-	return 0;
+        ret = 0;
     }
     odr_destroy (odr_output);
-    return 1;
+    return ret;
 }
 
 int tl_meta_query(ZebraHandle zh, char *query, int exphits,
 		  zint *ids)
 {
     ZebraMetaRecord *meta;
-    ODR odr_output = odr_createmem (ODR_ENCODE);    
-    const char *setname="rsetname";
-    zint *positions = (zint *) malloc(1 + (exphits * sizeof(zint)));
-    int i;
+    const char *setname= "rsetname";
+    zint *positions = 0;
+    int i, ret = 1;
         
     if (!tl_query(zh, query, exphits))
 	return 0;
     
+    positions = (zint *) xmalloc(1 + (exphits * sizeof(zint)));
     for (i = 0; i<exphits; i++)
         positions[i] = i+1;
 
-    meta = zebra_meta_records_create (zh, setname,  exphits, positions);
+    meta = zebra_meta_records_create(zh, setname,  exphits, positions);
     
     if (!meta)
     {
         printf("Error: retrieve returned error\n%s\n", query);
+        xfree(positions);
 	return 0;
     }
 
@@ -372,13 +368,12 @@ int tl_meta_query(ZebraHandle zh, char *query, int exphits,
 	{
 	    printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT "\n",
 		   ids[i], meta[i].sysno);
-	    return 0;
+            ret = 0;
 	}
     }
     zebra_meta_records_destroy(zh, meta, exphits);
-    odr_destroy (odr_output);
-    free(positions);
-    return 1;
+    xfree(positions);
+    return ret;
 }
 
 int tl_sort(ZebraHandle zh, const char *query, zint hits, zint *exp)
@@ -452,6 +447,73 @@ void tl_check_filter(ZebraService zs, const char *name)
     }
 }
 
+ZEBRA_RES tl_fetch(ZebraHandle zh, int position, const char *element_set,
+                   const Odr_oid * format, ODR odr,
+                   const char **rec_buf, size_t *rec_len)
+{
+    ZebraRetrievalRecord retrievalRecord[1];
+    Z_RecordComposition *comp;
+    ZEBRA_RES res;
 
+    retrievalRecord[0].position = position;
+    
+    yaz_set_esn(&comp, element_set, odr->mem);
 
+    res = zebra_records_retrieve(zh, odr, "rsetname", comp, format, 1, 
+                                 retrievalRecord);
+    if (res != ZEBRA_OK)
+    {
+        int code = zebra_errCode(zh);
+        yaz_log(YLOG_FATAL, "zebra_records_retrieve returned error %d",
+                code);
+    }
+    else
+    {
+        *rec_buf = retrievalRecord[0].buf;
+        *rec_len = retrievalRecord[0].len;
+    }
+    return res;
+}
+
+ZEBRA_RES tl_fetch_compare(ZebraHandle zh,
+                           int position, const char *element_set,
+                           const Odr_oid *format, const char *cmp_rec)
+{
+    const char *rec_buf = 0;
+    size_t rec_len = 0;
+    ODR odr = odr_createmem(ODR_ENCODE);
+    ZEBRA_RES res = tl_fetch(zh, position, element_set, format, odr,
+                             &rec_buf, &rec_len);
+    if (res == ZEBRA_OK)
+    {
+        if (strlen(cmp_rec) != rec_len)
+            res = ZEBRA_FAIL;
+        else if (memcmp(cmp_rec, rec_buf, rec_len))
+            res = ZEBRA_FAIL;
+        if (res == ZEBRA_FAIL)
+        {
+            int l = rec_len;
+            yaz_log(YLOG_LOG, "Expected: %s", cmp_rec);
+            yaz_log(YLOG_LOG, "Got: %.*s", l, rec_buf);
+        }
+    }
+    odr_destroy(odr);
+    return res;
+}
+
+ZEBRA_RES tl_fetch_first_compare(ZebraHandle zh,
+                                 const char *element_set,
+                                 const Odr_oid *format, const char *cmp_rec)
+{
+    return tl_fetch_compare(zh, 1, element_set, format, cmp_rec);
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */