X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftorus.cpp;h=e286adf7e58b518600a20037f4b9ff6af36aca69;hb=056d8d0c4ee4b9e383463ecdde7aa84901909aa4;hp=d2ebd9f82a8691ae84ad9b53a63e75471e8d6245;hpb=6bbc073d4048f6bbff75e165b7539b9adbe22559;p=metaproxy-moved-to-github.git

diff --git a/src/torus.cpp b/src/torus.cpp
index d2ebd9f..e286adf 100644
--- a/src/torus.cpp
+++ b/src/torus.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 Index Data
+   Copyright (C) 2005-2012 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
@@ -29,13 +29,29 @@ namespace mp = metaproxy_1;
 
 xmlDoc *mp::get_searchable(mp::Package &package,
                            std::string url_template, const std::string &db,
+                           const std::string &query,
                            const std::string &realm,
                            const std::string &proxy)
 {
-    // http://newmk2.indexdata.com/torus2/searchable.ebsco/records/?query=udb=aberdeenUni
+    // http://mk2.indexdata.com/torus2/searchable/records/?query=udb%3d%db
+    // or
+    // http://mk2.indexdata.com/torus2/searchable/records/?query=%query
     xmlDoc *doc = 0;
     size_t found;
 
+    found = url_template.find("%query");
+    if (found != std::string::npos)
+        url_template.replace(found, 6, mp::util::uri_encode(query));
+    else
+    {
+        if (db.length() == 0)
+        {
+            package.log("zoom", YLOG_WARN,
+                        "%query not defined in <torus url=\"..\"");
+            return 0;
+        }
+    }
+
     found = url_template.find("%db");
     if (found != std::string::npos)
         url_template.replace(found, 3, mp::util::uri_encode(db));