Happy new year.

[idzebra-moved-to-github.git] / test / api / testlib.c

diff --git a/test/api/testlib.c b/test/api/testlib.c
index 7773351..8a11239 100644 (file)
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,8 +1,5 @@
-/* $Id: testlib.c,v 1.46 2007-11-30 10:08:01 adam Exp $
-   Copyright (C) 1995-2007
-   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
@@ -450,19 +447,19 @@ void tl_check_filter(ZebraService zs, const char *name)
     }
 }
 
-ZEBRA_RES tl_fetch_first(ZebraHandle zh, const char *element_set,
-                         const Odr_oid * format, ODR odr,
-                         const char **rec_buf, size_t *rec_len)
+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 = 1; /* get from this position */
+    retrievalRecord[0].position = position;
     
     yaz_set_esn(&comp, element_set, odr->mem);
 
-    res = zebra_records_retrieve(zh, odr, "default", comp, format, 1, 
+    res = zebra_records_retrieve(zh, odr, "rsetname", comp, format, 1, 
                                  retrievalRecord);
     if (res != ZEBRA_OK)
     {
@@ -478,33 +475,43 @@ ZEBRA_RES tl_fetch_first(ZebraHandle zh, const char *element_set,
     return res;
 }
 
-ZEBRA_RES tl_fetch_first_compare(ZebraHandle zh,
-                                 const char *element_set,
-                                 const Odr_oid *format, const char *cmp_rec)
+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_first(zh, element_set, format, odr,
-                                   &rec_buf, &rec_len);
+    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