X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftest_special_elements.c;h=d4898442290f739b30f3c798530992c8dd5a2829;hb=250de4ed23a44f5eb3552db317eef0d0fbe3265c;hp=2d9296147a51348d90a83db76a2fe1bbf46da8e6;hpb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;p=idzebra-moved-to-github.git

diff --git a/test/api/test_special_elements.c b/test/api/test_special_elements.c
index 2d92961..d489844 100644
--- a/test/api/test_special_elements.c
+++ b/test/api/test_special_elements.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1994-2009 Index Data
+   Copyright (C) 2004-2013 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
@@ -19,6 +19,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /** \brief test special element set names zebra:: and friends */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "testlib.h"
 
 const char *myrec[] = {
@@ -26,22 +29,27 @@ const char *myrec[] = {
         "  <title>My title</title>\n"
         "</gils>\n",
         0};
-	
+
 static void tst(int argc, char **argv)
 {
     zint hits;
     ZEBRA_RES res;
-    const char * zebra_xml_sysno 
+    const char * zebra_xml_sysno
         = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\"/>\n";
 
-    const char * zebra_xml_meta 
+    const char * zebra_xml_meta
         = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\" base=\"Default\" type=\"grs.sgml\" rank=\"0\" size=\"41\" set=\"zebra::meta\"/>\n";
 
     const char * zebra_xml_index_title_p
-        = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\" set=\"zebra::index::title:p/\">\n"
+        = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\" set=\"zebra::index::title:p\">\n"
 "  <index name=\"title\" type=\"p\" seq=\"4\">my title</index>\n"
 "</record>\n";
 
+    const char * zebra_xml_index_title_s
+        = "<record xmlns=\"http://www.indexdata.com/zebra/\" sysno=\"2\" set=\"zebra::index::title:s\">\n"
+"  <index name=\"title\" type=\"s\">my title</index>\n"
+"</record>\n";
+
     ZebraService zs = tl_start_up(0, argc, argv);
     ZebraHandle zh = zebra_open(zs, 0);
 
@@ -50,37 +58,41 @@ static void tst(int argc, char **argv)
     res = zebra_search_PQF(zh, "@attr 1=4 my", "rsetname", &hits);
     YAZ_CHECK_EQ(res, ZEBRA_OK);
     YAZ_CHECK_EQ(hits, 1);
-    
+
     YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::data", yaz_oid_recsyn_xml,
                                         "mismatch"), ZEBRA_FAIL);
-    
+
     YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::data", yaz_oid_recsyn_sutrs,
                                         myrec[0]), ZEBRA_OK);
-    
+
     YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::data", yaz_oid_recsyn_xml,
                                         myrec[0]), ZEBRA_OK);
-    
-    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::meta::sysno", 
+
+    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::meta::sysno",
                                         yaz_oid_recsyn_sutrs,
                                         "2"), ZEBRA_OK);
-    
-    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::meta::sysno", 
+
+    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::meta::sysno",
                                         yaz_oid_recsyn_xml,
                                         zebra_xml_sysno), ZEBRA_OK);
-    
+
     YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::meta", yaz_oid_recsyn_xml,
                                         zebra_xml_meta), ZEBRA_OK);
-    
-    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::index::title:p", 
+
+    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::index::title:p",
                                         yaz_oid_recsyn_xml,
                                         zebra_xml_index_title_p), ZEBRA_OK);
-    
-    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::nonexistent", 
+
+    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::index::title:s",
+                                        yaz_oid_recsyn_xml,
+                                        zebra_xml_index_title_s), ZEBRA_OK);
+
+    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::nonexistent",
                                         yaz_oid_recsyn_xml, ""), ZEBRA_OK);
-    
-    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::index::nonexistent", 
+
+    YAZ_CHECK_EQ(tl_fetch_first_compare(zh, "zebra::index::nonexistent",
                                         yaz_oid_recsyn_xml, ""), ZEBRA_OK);
-    
+
     YAZ_CHECK(tl_close_down(zh, zs));
 }
 
@@ -89,6 +101,7 @@ TL_MAIN
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab