X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ft14.c;h=cd43023ec73181a71438d4f5bcc4b2ea3c0b4647;hp=dd7618ed978f2ba550c21c88574ce03537509774;hb=21f90a8618faec6bee8d125c12088b74db8eb8b9;hpb=3e76d7533ae842c778fb8cd99e364bae25c361e9

diff --git a/test/api/t14.c b/test/api/t14.c
index dd7618e..cd43023 100644
--- a/test/api/t14.c
+++ b/test/api/t14.c
@@ -1,5 +1,5 @@
-/* $Id: t14.c,v 1.1 2005-12-15 13:28:46 adam Exp $
-   Copyright (C) 2004-2005
+/* $Id: t14.c,v 1.7 2007-03-14 11:48:32 adam Exp $
+   Copyright (C) 2004-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,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
+
 */
 
 #include "testlib.h"
@@ -26,53 +26,58 @@ static void create_search_drop(ZebraHandle zh)
 {
     const char *rec = "<gils><title>some</title></gils>";
     const char *opaque_id = "9";
-    ZEBRA_RES res;
-
-    res = zebra_create_database (zh, "Default");
-    TL_ASSERT(res == ZEBRA_OK);
-
-#if 0
-    /* probably bug #447 .. but we don't know */
-    res = zebra_admin_exchange_record (
-	zh, rec, strlen(rec),
-	opaque_id, strlen(opaque_id),
-	1); /* insert */
 
-    TL_ASSERT(res == ZEBRA_FAIL);
-#endif
+    YAZ_CHECK(zebra_create_database (zh, "Default") == ZEBRA_OK);
 
-    res = zebra_admin_exchange_record (
-	zh, rec, strlen(rec),
-	opaque_id, strlen(opaque_id),
-	4); /* update/insert */
-
-    TL_ASSERT(res == ZEBRA_OK);
-    do_query(__LINE__, zh, "@attr 1=4 some", 1);
+    /* bug #447 */
+    YAZ_CHECK(zebra_update_record(
+		  zh, action_update,
+                  0 /* record type */,
+                  0 /* sysno */,
+                  opaque_id,
+                  0 /* fname */,
+                  rec, strlen(rec))
+              == ZEBRA_OK); /* insert really */
+    
+    YAZ_CHECK(zebra_update_record(
+		  zh, action_update,
+                  0 /* record type */,
+                  0 /* sysno */,
+                  opaque_id,
+                  0 /* fname */,
+                  rec, strlen(rec))
+              == ZEBRA_OK); /* replace really */
+    
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 some", 1));
 
     zebra_drop_database(zh, "Default");
 
-    do_query_x(__LINE__, zh, "@attr 1=4 some", 0, 109);
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=4 some", 0, 109));
 
 }
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up("zebra.cfg", argc, argv);
+    ZebraService zs = tl_start_up("zebra.cfg", argc, argv);
     ZebraHandle zh = zebra_open(zs, 0);
-    ZEBRA_RES res;
 
-    res = zebra_select_database(zh, "Default");
-    TL_ASSERT(res == ZEBRA_OK);
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
     create_search_drop(zh);
-#if 0
     /* bug #447 */
     create_search_drop(zh);
-#endif
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
 
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */