X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftstxmlquery.c;h=fb0fddba3fe282187a1815aa637d2f1d6d196c17;hb=7e156f9a105b894b600c78d0b0a55224ae9b9793;hp=625d5e2d2d643d432aa4fa747e0bffd7eacb2040;hpb=3086f0e19e38428814c7da92fcaf21eba2bc9a64;p=yaz-moved-to-github.git

diff --git a/test/tstxmlquery.c b/test/tstxmlquery.c
index 625d5e2..fb0fddb 100644
--- a/test/tstxmlquery.c
+++ b/test/tstxmlquery.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstxmlquery.c,v 1.6 2006-01-30 14:02:07 adam Exp $
+ * $Id: tstxmlquery.c,v 1.8 2006-02-02 15:00:58 adam Exp $
  */
 
 #include <stdlib.h>
@@ -45,9 +45,9 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml)
         status = PQF_FAILED;
     else
     {
-        status = QUERY2XML_FAILED;
 #if HAVE_XML2
         xmlDocPtr doc = 0;
+
         yaz_rpnquery2xml(rpn, &doc);
         
         if (!doc)
@@ -71,6 +71,8 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml)
             }
             xmlFreeDoc(doc);
         }
+#else
+        status = QUERY2XML_FAILED;
 #endif
     }
     odr_destroy(odr);
@@ -86,7 +88,7 @@ void tst()
                      "<?xml version=\"1.0\"?>\n"
                      "<query set=\"Bib-1\" type=\"rpn\">"
                      "<apt><attr type=\"1\" value=\"4\"/>"
-                     "<term>computer</term></apt>"
+                     "<term type=\"general\">computer</term></apt>"
                      "</query>\n"), XML_MATCH);
     
     YAZ_CHECK_EQ(pqf2xml_text(
@@ -95,7 +97,7 @@ void tst()
                      "<query set=\"Bib-1\" type=\"rpn\">"
                      "<apt><attr type=\"1\" value=\"title\"/>"
                      "<attr type=\"2\" value=\"1\"/>"
-                     "<term>computer</term></apt>"
+                     "<term type=\"general\">computer</term></apt>"
                      "</query>\n"), XML_MATCH);
 
     YAZ_CHECK_EQ(pqf2xml_text(
@@ -104,7 +106,7 @@ void tst()
                      "<query set=\"Bib-1\" type=\"rpn\">"
                      "<apt><attr set=\"Exp-1\" type=\"1\" value=\"1\"/>"
                      "<attr type=\"2\" value=\"1\"/>"
-                     "<term>computer</term></apt>"
+                     "<term type=\"general\">computer</term></apt>"
                      "</query>\n"), XML_MATCH);
     
     YAZ_CHECK_EQ(pqf2xml_text(
@@ -112,7 +114,8 @@ void tst()
                      "<?xml version=\"1.0\"?>\n"
                      "<query set=\"Bib-1\" type=\"rpn\">"
                      "<binary type=\"and\">"
-                     "<apt><term>a</term></apt><apt><term>b</term></apt>"
+                     "<apt><term type=\"general\">a</term></apt>"
+                     "<apt><term type=\"general\">b</term></apt>"
                      "</binary></query>\n"), XML_MATCH);
     
     YAZ_CHECK_EQ(pqf2xml_text(
@@ -120,9 +123,10 @@ void tst()
                      "<?xml version=\"1.0\"?>\n"
                      "<query set=\"Bib-1\" type=\"rpn\">"
                      "<binary type=\"or\">"
-                     "<binary type=\"and\"><apt><term>a</term></apt>"
-                     "<apt><term>b</term></apt></binary>"
-                     "<apt><term>c</term></apt>"
+                     "<binary type=\"and\">"
+                     "<apt><term type=\"general\">a</term></apt>"
+                     "<apt><term type=\"general\">b</term></apt></binary>"
+                     "<apt><term type=\"general\">c</term></apt>"
                      "</binary></query>\n"), XML_MATCH);
 
     YAZ_CHECK_EQ(pqf2xml_text(
@@ -142,9 +146,34 @@ void tst()
                      "ordered=\"true\" "
                      "relationType=\"2\" "
                      "knownProximityUnit=\"2\">"
-                     "<apt><term>a</term></apt><apt><term>b</term></apt>"
+                     "<apt><term type=\"general\">a</term></apt>"
+                     "<apt><term type=\"general\">b</term></apt>"
                      "</binary></query>\n"), XML_MATCH);
 
+    YAZ_CHECK_EQ(pqf2xml_text(
+                     "@term numeric 32", 
+                     "<?xml version=\"1.0\"?>\n"
+                     "<query set=\"Bib-1\" type=\"rpn\">"
+                     "<apt>"
+                     "<term type=\"numeric\">32</term></apt>"
+                     "</query>\n"), XML_MATCH);
+    
+    YAZ_CHECK_EQ(pqf2xml_text(
+                     "@term string computer", 
+                     "<?xml version=\"1.0\"?>\n"
+                     "<query set=\"Bib-1\" type=\"rpn\">"
+                     "<apt>"
+                     "<term type=\"string\">computer</term></apt>"
+                     "</query>\n"), XML_MATCH);
+    
+    YAZ_CHECK_EQ(pqf2xml_text(
+                     "@term null void", 
+                     "<?xml version=\"1.0\"?>\n"
+                     "<query set=\"Bib-1\" type=\"rpn\">"
+                     "<apt>"
+                     "<term type=\"null\"/></apt>"
+                     "</query>\n"), XML_MATCH);
+    
 #endif
 }