X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft10.c;h=5fc0663c3a189527ab5aacb83c940435e3eea892;hb=6e8b41b7843838b712f1c25ca1be1f61edf1bc5d;hp=4429132d61ea590c76f97edc7c9cd34512187646;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git

diff --git a/test/api/t10.c b/test/api/t10.c
index 4429132..5fc0663 100644
--- a/test/api/t10.c
+++ b/test/api/t10.c
@@ -1,5 +1,5 @@
-/* $Id: t10.c,v 1.11 2006-05-10 08:13:35 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: t10.c,v 1.13 2006-10-23 09:31:48 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,86 +15,56 @@ 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
+
 */
 
-/** t10.c - test zv-rank */
+/* Creates a few result sets */
 
 #include "testlib.h"
-#include "rankingrecords.h"
-
-struct tst {
-    char *schema;
-    char *hit1;
-    int score1;
-    char *hit2;
-    int score2;
-    char *hit3;
-    int score3;
-};
-
-struct tst tests[] = {
-    {"ntc-atn", "first title", 0, "first title", 1000, "first title",1000 },
-    {"ntc-ntn", "first title", 0, "first title", 1000, "first title",1000 },
-    {"ntc-btn", "first title", 0, "first title", 1000, "first title",1000 },
-    {"ntc-apn", "first title", 0,    "first title", 1000, "first title",1000 },
-    {"ntc-npn", "first title", 0,    "first title", 1000, "first title",1000 },
-    {"ntc-bpn", "first title", 0,    "first title", 1000, "first title",1000 },
-    {"atc-atn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"atc-ntn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"atc-btn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"atc-apn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"atc-npn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"atc-bpn", "first title", 0,    "first title", 1000, "first title", 1000 },
-
-    {"npc-atn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"npc-ntn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"npc-btn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"npc-apn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"npc-npn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"npc-bpn", "first title", 0,    "first title", 1000, "first title", 1000 },
-
-    {"apc-atn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"apc-ntn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"apc-btn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"apc-apn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"apc-npn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {"apc-bpn", "first title", 0,    "first title", 1000, "first title", 1000 },
-    {0,0,0,0,0,0,0},
-};
+
+const char *myrec[] ={
+        "<t10>\n"
+        "  <title>My title</title>\n"
+        "</t10>\n",
+        0};
 
 static void tst(int argc, char **argv)
 {
-    int i;
-    ZebraService zs = tl_start_up("zebrazv.cfg", argc, argv);
+    ZebraService zs = tl_start_up("zebra10.cfg", argc, argv);
     ZebraHandle zh = zebra_open(zs, 0);
-  
-    YAZ_CHECK(tl_init_data(zh, recs));
-    zebra_close(zh);
-    for (i = 0; tests[i].schema; i++)
-    {
-        zh = zebra_open(zs, 0);
-	YAZ_CHECK(zh);
-        YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
-
-        zebra_set_resource(zh, "zvrank.weighting-scheme", tests[i].schema);
-        yaz_log(YLOG_LOG,"============%d: %s ===========", i, tests[i].schema);
-
-        YAZ_CHECK(tl_ranking_query(zh, "@attr 1=1016 @attr 2=102 the",
-				   3, tests[i].hit1, tests[i].score1));
-        YAZ_CHECK(tl_ranking_query(zh, "@attr 1=1016 @attr 2=102 @or foo bar",
-				   3, tests[i].hit2, tests[i].score2));
-        YAZ_CHECK(tl_ranking_query(zh, 
-				   "@attr 1=1016 @attr 2=102 @or @or the foo bar",
-				   3, tests[i].hit3, tests[i].score3));
-        zebra_close(zh);
-    }
-    YAZ_CHECK(tl_close_down(0, zs));
+
+    YAZ_CHECK(tl_init_data(zh, myrec));
+
+    zebra_commit(zh);
+
+    // string attributes in search
+    YAZ_CHECK(tl_query(zh, "@attr 1=title my", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title my", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title titlex", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=extra_title my", 1));
+
+    // numeric attributes with Bib-1 should produce an error
+    YAZ_CHECK(tl_query_x(zh, 
+                         "@attr 1=4 my", 0, 121));
+    YAZ_CHECK(tl_query_x(zh, 
+                         "@attr 1=7 my", 0, 121));
+    // private OID with incorrect use attribute
+    YAZ_CHECK(tl_query_x(zh, 
+                         "@attr 1.2.840.10003.3.1000.1000.1 1=4 my", 0, 114));
+    // private OID with OK use attribute
+    YAZ_CHECK(tl_query(zh, 
+                       "@attr 1.2.840.10003.3.1000.1000.1 1=7 my", 1));
+
+    YAZ_CHECK(tl_query(zh, 
+                       "@attr 1.2.840.10003.3.1000.1000.1 1=8 my", 1));
+
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
 
 TL_MAIN
+
 /*
  * Local variables:
  * c-basic-offset: 4