X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Frusmarc%2Ft1.c;h=7ab3aaee742bc44e97f6b0a8d7c153d8c0ddc204;hp=dafda87081223608461d5367813352c3e5192c7e;hb=89d3a004b7c651fd5673abfc192e1472dc4d4197;hpb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580

diff --git a/test/rusmarc/t1.c b/test/rusmarc/t1.c
index dafda87..7ab3aae 100644
--- a/test/rusmarc/t1.c
+++ b/test/rusmarc/t1.c
@@ -1,5 +1,5 @@
-/* $Id: t1.c,v 1.4 2005-09-13 11:51:09 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: t1.c,v 1.9 2007-01-15 15:10:23 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,16 +15,16 @@ 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 <yaz/yaz-iconv.h>
 
 #include "../api/testlib.h"
 
-void check_koi8r()
+void check_koi8r(void)
 {
     yaz_iconv_t cd = yaz_iconv_open("koi8-r", "utf-8");
     if (!cd)
@@ -35,27 +35,36 @@ void check_koi8r()
     yaz_iconv_close(cd);
 }
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     
-    ZebraService zs = start_up(0, argc, argv);
+    ZebraService zs = tl_start_up(0, argc, argv);
     ZebraHandle  zh = zebra_open(zs, 0);
     char path[256];
 
     check_koi8r();
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
-    
-    zebra_begin_trans(zh, 1);
-    sprintf(path, "%.200s/records/simple-rusmarc", get_srcdir());
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
+    sprintf(path, "%.200s/records/simple-rusmarc", tl_get_srcdir());
     zebra_repository_update(zh, path);
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    do_query(__LINE__, zh, "@attr 1=21 \xfa\xc1\xcd\xd1\xd4\xc9\xce", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=21 \xfa\xc1\xcd\xd1\xd4\xc9\xce", 1));
 
-    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
+ */
+