X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fcharmap%2Fcharmap1.c;h=82f242f9175eddab8e55bc942c5393ff13c1e03a;hp=b1c776cebb73ddd181a74e529274cb89701ea255;hb=f5eb6612606c3365834ea5aad430b364902d42a3;hpb=b253fbc82a68432634d84a1ed7a9ac7017446969

diff --git a/test/charmap/charmap1.c b/test/charmap/charmap1.c
index b1c776c..82f242f 100644
--- a/test/charmap/charmap1.c
+++ b/test/charmap/charmap1.c
@@ -1,8 +1,5 @@
-/* $Id: charmap1.c,v 1.6 2005-06-14 10:33:31 adam Exp $
-   Copyright (C) 1995-2005
-   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
@@ -15,68 +12,92 @@ 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
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "../api/testlib.h"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle  zh = zebra_open(zs);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs, 0);
     char path[256];
 
-    check_filter(zs, "grs.xml");
+    tl_check_filter(zs, "grs.xml");
 
-    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/x.xml", get_srcdir());
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
+
+    sprintf(path, "%.200s/x.xml", 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, "@term string æ", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string æ", 1));
 
     /* search for UNICODE 1E25 - letter h with dot below */
-    do_query(__LINE__, zh, "@term string ḥ", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string ḥ", 1));
 
     /* search for UNICODE A ring */
-    do_query(__LINE__, zh, "@term string lås", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string lås", 1));
 
     /* search for aa  */
-    do_query(__LINE__, zh, "@term string laas", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string laas", 1));
 
     /* search for aa regular-1 */
-    do_query(__LINE__, zh, "@attr 5=102 @term string lås", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=102 @term string lås", 1));
 
     /* search for aa regular-2 */
-    do_query(__LINE__, zh, "@attr 5=103 @term string lås", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 @term string lås", 1));
 
     /* search for aa trunc=104 */
-    do_query(__LINE__, zh, "@attr 5=104 @term string laas", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=104 @term string laas", 1));
 
     /* search for aa trunc=105 */
-    do_query(__LINE__, zh, "@attr 5=104 @term string laas", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=104 @term string laas", 1));
 
     /* search for aaa  */
-    do_query(__LINE__, zh, "@term string laaas", 0);
-    
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string laaas", 0));
+
     /* search ABC in title:0 .  */
-    do_query(__LINE__, zh, "@attr 4=3 @attr 1=4 ABC", 1);
-    
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=3 @attr 1=4 ABC", 1));
+
     /* search DEF in title:0 .  */
-    do_query(__LINE__, zh, "@attr 4=3 @attr 1=4 DEF", 0);
-    
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=3 @attr 1=4 DEF", 0));
+
     /* search [ in title:0 .  */
-    do_query(__LINE__, zh, "@attr 4=3 @attr 1=4 [", 1);
-    
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=3 @attr 1=4 [", 1));
+
     /* search \ in title:0 .  */
-    do_query(__LINE__, zh, "@attr 4=3 @attr 1=4 \\\\\\\\", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=3 @attr 1=4 \\\\", 1));
+
+    /* search \ in title:0 .  Process # in term */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=3 @attr 1=4 @attr 5=101 \\\\", 1));
+
+    /* search \ in title:0 .  RegExpr-1 */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=3 @attr 1=4 @attr 5=102 \\\\\\\\", 1));
 
-    return close_down(zh, zs, 0);
+    /* search { in title:0 .  */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=3 @attr 1=4 \\{", 1));
+
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+