X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_xmlutil.cpp;h=c19590a61b82df0691c2e93d73d3ee876d2f7c59;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=13065a1cde3fc6105a6f0ce243e7a027ca730823;hpb=e5329397729e8959a821c6956f75012372fc0a77;p=metaproxy-moved-to-github.git

diff --git a/src/test_xmlutil.cpp b/src/test_xmlutil.cpp
index 13065a1..c19590a 100644
--- a/src/test_xmlutil.cpp
+++ b/src/test_xmlutil.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 Index Data
+   Copyright (C) Index Data
 
 Metaproxy 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
@@ -36,9 +36,9 @@ namespace mp_xml = metaproxy_1::xml;
 
 BOOST_AUTO_TEST_CASE( url_recipe )
 {
-    try 
+    try
     {
-        const char *xml_text = 
+        const char *xml_text =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
             "<pz:record xmlns:pz=\"http://www.indexdata.com/pazpar2/1.0\""
             " xmlns:tmarc=\"http://www.indexdata.com/turbomarc\">\n"
@@ -63,44 +63,51 @@ BOOST_AUTO_TEST_CASE( url_recipe )
             BOOST_CHECK(!res.compare("abc"));
 
             res = mp_xml::url_recipe_handle(doc, "${has-fulltext[no/yes]}");
-            std::cout << "res=" << res << std::endl;
             BOOST_CHECK(!res.compare("yes"));
 
+            res = mp_xml::url_recipe_handle(doc, "<${has-fulltext[no/yes]}>");
+            BOOST_CHECK(!res.compare("<yes>"));
+
             res = mp_xml::url_recipe_handle(doc, "${has-fulltext[no]}");
-            std::cout << "res=" << res << std::endl;
             BOOST_CHECK(!res.compare(""));
 
             res = mp_xml::url_recipe_handle(doc, "${has-fulltext[no/]}");
-            std::cout << "res=" << res << std::endl;
             BOOST_CHECK(!res.compare(""));
 
             res = mp_xml::url_recipe_handle(doc, "${has-fulltext[n/]}");
-            std::cout << "res=" << res << std::endl;
             BOOST_CHECK(!res.compare("o"));
 
             res = mp_xml::url_recipe_handle(doc, "${has-fulltext}");
-            std::cout << "res=" << res << std::endl;
+            BOOST_CHECK(!res.compare("no"));
+
+            res = mp_xml::url_recipe_handle(doc, "%{has-fulltext}");
             BOOST_CHECK(!res.compare("no"));
 
             res = mp_xml::url_recipe_handle(
                 doc, "http://sever.com?title=${md-title[\\s+/+/g]}");
-            std::cout << "res=" << res << std::endl;
             BOOST_CHECK(!res.compare("http://sever.com?title=How+to+program+a+computer"));
 
+            res = mp_xml::url_recipe_handle(
+                doc, "http://sever.com?title=%{md-title}");
+            BOOST_CHECK(!res.compare("http://sever.com?title=How%20to%20program%20a%20computer"));
+
+
             res = mp_xml::url_recipe_handle(doc, "${md-id[2/1]}");
-            std::cout << "res=" << res << std::endl;
             BOOST_CHECK(!res.compare("   11124466 "));
 
             res = mp_xml::url_recipe_handle(doc, "${md-id[2/1/g]}");
-            std::cout << "res=" << res << std::endl;
             BOOST_CHECK(!res.compare("   11114466 "));
 
-
             xmlFreeDoc(doc);
         }
     }
+    catch ( std::runtime_error &e) {
+        std::cout << "std::runtime error: " << e.what() << std::endl;
+        BOOST_CHECK(false);
+    }
     catch ( ... ) {
-        BOOST_CHECK (false);
+        std::cout << "unknown exception" << std::endl;
+        BOOST_CHECK(false);
     }
 }