X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fcharmap%2Fcharmap1.c;h=5c4ed6b22a8a883796facffbd1c834577d7757fd;hp=e53dce685f635bfce32524f3614349c6a6de52d5;hb=89d3a004b7c651fd5673abfc192e1472dc4d4197;hpb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f

diff --git a/test/charmap/charmap1.c b/test/charmap/charmap1.c
index e53dce6..5c4ed6b 100644
--- a/test/charmap/charmap1.c
+++ b/test/charmap/charmap1.c
@@ -1,5 +1,5 @@
-/* $Id: charmap1.c,v 1.9 2006-03-31 15:58:06 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: charmap1.c,v 1.13 2007-01-15 15:10:20 adam Exp $
+   Copyright (C) 1995-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 "../api/testlib.h"
@@ -41,48 +41,56 @@ static void tst(int argc, char **argv)
     YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    YAZ_CHECK(tl_query(zh, "@term string æ", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string æ", 1));
 
     /* search for UNICODE 1E25 - letter h with dot below */
-    YAZ_CHECK(tl_query(zh, "@term string ḥ", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string ḥ", 1));
 
     /* search for UNICODE A ring */
-    YAZ_CHECK(tl_query(zh, "@term string lås", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string lås", 1));
 
     /* search for aa  */
-    YAZ_CHECK(tl_query(zh, "@term string laas", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string laas", 1));
 
     /* search for aa regular-1 */
-    YAZ_CHECK(tl_query(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 */
-    YAZ_CHECK(tl_query(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 */
-    YAZ_CHECK(tl_query(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 */
-    YAZ_CHECK(tl_query(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  */
-    YAZ_CHECK(tl_query(zh, "@term string laaas", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @term string laaas", 0));
     
     /* search ABC in title:0 .  */
-    YAZ_CHECK(tl_query(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 .  */
-    YAZ_CHECK(tl_query(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 .  */
-    YAZ_CHECK(tl_query(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 .  */
-    YAZ_CHECK(tl_query(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 .  */
-    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=4 \\{", 1));
+    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
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+