X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxslt%2Fxslt1.c;h=9c1bd67f5bca7a5cef9ac5b93eec2bd9f2d7a478;hb=66389dd83548212275fda1dbe09a242c947afa30;hp=1e7835aaa1e9bc6f764af0ecccc0b0750088f489;hpb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580;p=idzebra-moved-to-github.git

diff --git a/test/xslt/xslt1.c b/test/xslt/xslt1.c
index 1e7835a..9c1bd67 100644
--- a/test/xslt/xslt1.c
+++ b/test/xslt/xslt1.c
@@ -1,4 +1,4 @@
-/* $Id: xslt1.c,v 1.5 2005-09-13 11:51:11 adam Exp $
+/* $Id: xslt1.c,v 1.8 2006-04-26 13:27:16 marc Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -20,33 +20,43 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
+#include <yaz/test.h>
 #include "testlib.h"
-	
-int main(int argc, char **argv)
+
+void tst(int argc, char **argv)
 {
     char path[256];
+    char profile_path[256];
 
-    ZebraService zs = start_up(0, argc, argv);
+    ZebraService zs = tl_start_up(0, argc, argv);
     ZebraHandle  zh = zebra_open(zs, 0);
 
-    check_filter(zs, "xslt");
+    tl_check_filter(zs, "xslt");
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
+    sprintf(profile_path, "%s:%s/../../tab", 
+            tl_get_srcdir(), tl_get_srcdir());
+    zebra_set_resource(zh, "profilePath", profile_path);
+
     zebra_set_resource(zh, "recordType", "xslt.marcschema-col.xml");
 
-    zebra_begin_trans(zh, 1);
-    sprintf(path, "%.200s/marc-col.xml", get_srcdir());
-    zebra_repository_update(zh, path);
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
+    sprintf(path, "%s/marc-col.xml", tl_get_srcdir());
 
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_repository_update(zh, path) == ZEBRA_OK);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    do_query(__LINE__, zh, "@attr 1=title computer", 3);
-    do_query(__LINE__, zh, "@attr 1=control 11224466", 1);
-    do_query_x(__LINE__, zh, "@attr 1=titl computer", 0, 121);
+    YAZ_CHECK(tl_query(zh, "@attr 1=title computer", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 1=control 11224466", 1));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=titl computer", 0, 114));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=4 computer", 0, 121));
     
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+