Cleaned the test programs a bit, used routines in testlib

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

diff --git a/test/api/t2.c b/test/api/t2.c
index 4e0d6bc..51f479f 100644 (file)
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,38 +1,60 @@
-/*
- * $Id: t2.c,v 1.2 2002-02-20 23:07:54 adam Exp $
- */
+/* $Id: t2.c,v 1.13 2004-10-28 15:24:36 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   Index Data Aps
 
-#include <zebraapi.h>
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+#include <stdlib.h>
+#include <yaz/log.h>
+#include <idzebra/api.h>
+#include "testlib.h"
+
+/* read zebra.cfg from env var srcdir if it exists; otherwise current dir */
 
 int main(int argc, char **argv)
 {
     ZebraService zs;
     ZebraHandle zh;
-    const char *myrec =
+    const char *myrec[] = {
         "<gils>\n"
         "  <title>My title</title>\n"
-        "</gils>\n";
-    ODR odr_input, odr_output;
+        "</gils>\n",
+        0};
+
+
+    yaz_log_init_file("t2.log");
 
     nmem_init ();
 
-    odr_input = odr_createmem (ODR_DECODE);    
-    odr_output = odr_createmem (ODR_ENCODE);    
-    
-    zs = zebra_start("t2.cfg");
+    zs = start_service(0);
     zh = zebra_open (zs);
-    
-    zebra_begin_trans (zh);
-    zebra_record_insert (zh, myrec, strlen(myrec));
+    init_data(zh,myrec);
+
+    Query(__LINE__,zh, "@attr 1=4 my", 1);
+
     zebra_end_trans (zh);
     zebra_commit (zh);
     zebra_close (zh);
     zebra_stop (zs);
 
-    odr_destroy (odr_input);
-    odr_destroy (odr_output);
-
     nmem_exit ();
     xmalloc_trav ("x");
+    logf(LOG_LOG,"================ All tests OK ");
     exit (0);
 }