X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=e9fd0db69e01637b01f6d7e7159ac4d1793a4774;hb=b484b17197842b9f282db212fce12ed44e2a2371;hp=adada8ffaa0732daab4e8552ac5b9a2d0d1e9181;hpb=1a6ec95e1020bd8e96698612f152a72cfe8f4415;p=metaproxy-moved-to-github.git

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index adada8f..e9fd0db 100644
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -19,9 +19,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "config.hpp"
 #include "filter_zoom.hpp"
 #include <yaz/zoom.h>
+#include <yaz/yaz-version.h>
+#include <yaz/tpath.h>
 #include <yaz/srw.h>
 #include <metaproxy/package.hpp>
 #include <metaproxy/util.hpp>
+#include <metaproxy/xmlutil.hpp>
 #include "torus.hpp"
 
 #include <libxslt/xsltutils.h>
@@ -29,8 +32,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
+#include <yaz/ccl_xml.h>
 #include <yaz/ccl.h>
 #include <yaz/rpn2cql.h>
+#include <yaz/rpn2solr.h>
 #include <yaz/pquery.h>
 #include <yaz/cql.h>
 #include <yaz/oid_db.h>
@@ -49,7 +54,7 @@ namespace metaproxy_1 {
             std::string cfAuth;
             std::string cfProxy;
             std::string cfSubDb;
-            std::string database;
+            std::string udb;
             std::string target;
             std::string query_encoding;
             std::string sru;
@@ -57,10 +62,11 @@ namespace metaproxy_1 {
             std::string element_set;
             std::string record_encoding;
             std::string transform_xsl_fname;
+            std::string urlRecipe;
             bool use_turbomarc;
             bool piggyback;
             CCL_bibset ccl_bibset;
-            Searchable();
+            Searchable(CCL_bibset base);
             ~Searchable();
         };
         class Zoom::Backend : boost::noncopyable {
@@ -75,16 +81,17 @@ namespace metaproxy_1 {
         public:
             Backend(SearchablePtr sptr);
             ~Backend();
-            void connect(std::string zurl, int *error, const char **addinfo);
+            void connect(std::string zurl, int *error, char **addinfo,
+                         ODR odr);
             void search_pqf(const char *pqf, Odr_int *hits,
-                            int *error, const char **addinfo);
+                            int *error, char **addinfo, ODR odr);
             void search_cql(const char *cql, Odr_int *hits,
-                            int *error, const char **addinfo);
+                            int *error, char **addinfo, ODR odr);
             void present(Odr_int start, Odr_int number, ZOOM_record *recs,
-                         int *error, const char **addinfo);
+                         int *error, char **addinfo, ODR odr);
             void set_option(const char *name, const char *value);
             const char *get_option(const char *name);
-            void get_zoom_error(int *error, const char **addinfo);
+            void get_zoom_error(int *error, char **addinfo, ODR odr);
         };
         class Zoom::Frontend : boost::noncopyable {
             friend class Impl;
@@ -98,11 +105,12 @@ namespace metaproxy_1 {
             void handle_present(mp::Package &package);
             BackendPtr get_backend_from_databases(std::string &database,
                                                   int *error,
-                                                  const char **addinfo);
+                                                  char **addinfo,
+                                                  ODR odr);
             Z_Records *get_records(Odr_int start,
                                    Odr_int number_to_present,
                                    int *error,
-                                   const char **addinfo,
+                                   char **addinfo,
                                    Odr_int *number_of_records_returned,
                                    ODR odr, BackendPtr b,
                                    Odr_oid *preferredRecordSyntax,
@@ -117,11 +125,13 @@ namespace metaproxy_1 {
             Impl();
             ~Impl();
             void process(metaproxy_1::Package & package);
-            void configure(const xmlNode * ptr, bool test_only);
+            void configure(const xmlNode * ptr, bool test_only,
+                           const char *path);
         private:
+            void configure_local_records(const xmlNode * ptr, bool test_only);
             FrontendPtr get_frontend(mp::Package &package);
             void release_frontend(mp::Package &package);
-            SearchablePtr parse_torus(const xmlNode *ptr);
+            SearchablePtr parse_torus_record(const xmlNode *ptr);
             struct cql_node *convert_cql_fields(struct cql_node *cn, ODR odr);
             std::map<mp::Session, FrontendPtr> m_clients;            
             boost::mutex m_mutex;
@@ -129,6 +139,11 @@ namespace metaproxy_1 {
             std::string torus_url;
             std::map<std::string,std::string> fieldmap;
             std::string xsldir;
+            std::string file_path;
+            CCL_bibset bibset;
+            std::string element_transform;
+            std::string element_raw;
+            std::map<std::string,SearchablePtr> s_map;
         };
     }
 }
@@ -143,9 +158,10 @@ yf::Zoom::~Zoom()
 {  // must have a destructor because of boost::scoped_ptr
 }
 
-void yf::Zoom::configure(const xmlNode *xmlnode, bool test_only)
+void yf::Zoom::configure(const xmlNode *xmlnode, bool test_only,
+                         const char *path)
 {
-    m_p->configure(xmlnode, test_only);
+    m_p->configure(xmlnode, test_only, path);
 }
 
 void yf::Zoom::process(mp::Package &package) const
@@ -172,34 +188,57 @@ yf::Zoom::Backend::~Backend()
 }
 
 
-void yf::Zoom::Backend::get_zoom_error(int *error, const char **addinfo)
+void yf::Zoom::Backend::get_zoom_error(int *error, char **addinfo,
+                                       ODR odr)
 {
     const char *msg = 0;
-    *error = ZOOM_connection_error(m_connection, &msg, addinfo);
+    const char *zoom_addinfo = 0;
+    *error = ZOOM_connection_error(m_connection, &msg, &zoom_addinfo);
     if (*error)
     {
         if (*error >= ZOOM_ERROR_CONNECT)
         {
             // turn ZOOM diagnostic into a Bib-1 2: with addinfo=zoom err msg
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-            if (addinfo)
-                *addinfo = msg;
+            *addinfo = (char *) odr_malloc(
+                odr, 20 + strlen(msg) + 
+                (zoom_addinfo ? strlen(zoom_addinfo) : 0));
+            strcpy(*addinfo, msg);
+            if (zoom_addinfo)
+            {
+                strcat(*addinfo, ": ");
+                strcat(*addinfo, zoom_addinfo);
+                strcat(*addinfo, " ");
+            }
+        }
+        else
+        {
+            *addinfo = (char *) odr_malloc(
+                odr, 20 + (zoom_addinfo ? strlen(zoom_addinfo) : 0));
+            **addinfo = '\0';
+            if (zoom_addinfo && *zoom_addinfo)
+            {
+                strcpy(*addinfo, zoom_addinfo);
+                strcat(*addinfo, " ");
+            }
+            strcat(*addinfo, "(backend)");
         }
     }
 }
 
 void yf::Zoom::Backend::connect(std::string zurl,
-                                int *error, const char **addinfo)
+                                int *error, char **addinfo,
+                                ODR odr)
 {
     ZOOM_connection_connect(m_connection, zurl.c_str(), 0);
-    get_zoom_error(error, addinfo);
+    get_zoom_error(error, addinfo, odr);
 }
 
 void yf::Zoom::Backend::search_pqf(const char *pqf, Odr_int *hits,
-                                   int *error, const char **addinfo)
+                                   int *error, char **addinfo, ODR odr)
 {
     m_resultset = ZOOM_connection_search_pqf(m_connection, pqf);
-    get_zoom_error(error, addinfo);
+    get_zoom_error(error, addinfo, odr);
     if (*error == 0)
         *hits = ZOOM_resultset_size(m_resultset);
     else
@@ -207,7 +246,7 @@ void yf::Zoom::Backend::search_pqf(const char *pqf, Odr_int *hits,
 }
 
 void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits,
-                                   int *error, const char **addinfo)
+                                   int *error, char **addinfo, ODR odr)
 {
     ZOOM_query q = ZOOM_query_create();
 
@@ -215,7 +254,7 @@ void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits,
 
     m_resultset = ZOOM_connection_search(m_connection, q);
     ZOOM_query_destroy(q);
-    get_zoom_error(error, addinfo);
+    get_zoom_error(error, addinfo, odr);
     if (*error == 0)
         *hits = ZOOM_resultset_size(m_resultset);
     else
@@ -224,10 +263,10 @@ void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits,
 
 void yf::Zoom::Backend::present(Odr_int start, Odr_int number,
                                 ZOOM_record *recs,
-                                int *error, const char **addinfo)
+                                int *error, char **addinfo, ODR odr)
 {
     ZOOM_resultset_records(m_resultset, recs, start, number);
-    get_zoom_error(error, addinfo);
+    get_zoom_error(error, addinfo, odr);
 }
 
 void yf::Zoom::Backend::set_option(const char *name, const char *value)
@@ -242,11 +281,11 @@ const char *yf::Zoom::Backend::get_option(const char *name)
     return ZOOM_connection_option_get(m_connection, name);
 }
 
-yf::Zoom::Searchable::Searchable()
+yf::Zoom::Searchable::Searchable(CCL_bibset base)
 {
     piggyback = true;
     use_turbomarc = true;
-    ccl_bibset = ccl_qual_mk();
+    ccl_bibset = ccl_qual_dup(base);
 }
 
 yf::Zoom::Searchable::~Searchable()
@@ -308,124 +347,164 @@ void yf::Zoom::Impl::release_frontend(mp::Package &package)
     }
 }
 
-yf::Zoom::Impl::Impl()
+yf::Zoom::Impl::Impl() : element_transform("pz2") , element_raw("raw")
 {
+    bibset = ccl_qual_mk();
 }
 
 yf::Zoom::Impl::~Impl()
 { 
+    ccl_qual_rm(&bibset);
 }
 
-yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus(const xmlNode *ptr1)
+yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
 {
-    SearchablePtr notfound;
-    if (!ptr1)
-        return notfound;
-    for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next)
+    Zoom::SearchablePtr s(new Searchable(bibset));
+    
+    for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
-        if (ptr1->type != XML_ELEMENT_NODE)
+        if (ptr->type != XML_ELEMENT_NODE)
             continue;
-        if (!strcmp((const char *) ptr1->name, "record"))
+        if (!strcmp((const char *) ptr->name, "layer"))
+            ptr = ptr->children;
+        else if (!strcmp((const char *) ptr->name,
+                         "authentication"))
+        {
+            s->authentication = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "cfAuth"))
+        {
+            s->cfAuth = mp::xml::get_text(ptr);
+        } 
+        else if (!strcmp((const char *) ptr->name,
+                         "cfProxy"))
+        {
+            s->cfProxy = mp::xml::get_text(ptr);
+        }  
+        else if (!strcmp((const char *) ptr->name,
+                         "cfSubDb"))
+        {
+            s->cfSubDb = mp::xml::get_text(ptr);
+        }  
+        else if (!strcmp((const char *) ptr->name, "udb"))
+        {
+            s->udb = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name, "zurl"))
+        {
+            s->target = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name, "sru"))
+        {
+            s->sru = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "queryEncoding"))
+        {
+            s->query_encoding = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "piggyback"))
+        {
+            s->piggyback = mp::xml::get_bool(ptr, true);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "requestSyntax"))
+        {
+            s->request_syntax = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "elementSet"))
+        {
+            s->element_set = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "recordEncoding"))
+        {
+            s->record_encoding = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "transform"))
+        {
+            s->transform_xsl_fname = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "urlRecipe"))
+        {
+            s->urlRecipe = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "useTurboMarc"))
+        {
+            ; // useTurboMarc is ignored
+        }
+        else if (!strncmp((const char *) ptr->name,
+                          "cclmap_", 7))
+        {
+            std::string value = mp::xml::get_text(ptr);
+            ccl_qual_fitem(s->ccl_bibset, value.c_str(),
+                           (const char *) ptr->name + 7);
+        }
+    }
+    return s;
+}
+
+void yf::Zoom::Impl::configure_local_records(const xmlNode *ptr, bool test_only)
+{
+    while (ptr && ptr->type != XML_ELEMENT_NODE)
+        ptr = ptr->next;
+    
+    if (ptr)
+    {
+        if (!strcmp((const char *) ptr->name, "records"))
         {
-            const xmlNode *ptr2 = ptr1;
-            for (ptr2 = ptr2->children; ptr2; ptr2 = ptr2->next)
+            for (ptr = ptr->children; ptr; ptr = ptr->next)
             {
-                if (ptr2->type != XML_ELEMENT_NODE)
+                if (ptr->type != XML_ELEMENT_NODE)
                     continue;
-                if (!strcmp((const char *) ptr2->name, "layer"))
+                if (!strcmp((const char *) ptr->name, "record"))
                 {
-                    Zoom::SearchablePtr s(new Searchable);
-
-                    const xmlNode *ptr3 = ptr2;
-                    for (ptr3 = ptr3->children; ptr3; ptr3 = ptr3->next)
+                    SearchablePtr s = parse_torus_record(ptr);
+                    if (s)
                     {
-                        if (ptr3->type != XML_ELEMENT_NODE)
-                            continue;
-                        if (!strcmp((const char *) ptr3->name,
-                                    "authentication"))
+                        std::string udb = s->udb;
+                        if (udb.length())
+                            s_map[s->udb] = s;
+                        else
                         {
-                            s->authentication = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                    "cfAuth"))
-                        {
-                            s->cfAuth = mp::xml::get_text(ptr3);
-                        } 
-                        else if (!strcmp((const char *) ptr3->name,
-                                    "cfProxy"))
-                        {
-                            s->cfProxy = mp::xml::get_text(ptr3);
-                        }  
-                        else if (!strcmp((const char *) ptr3->name,
-                                    "cfSubDb"))
-                        {
-                            s->cfSubDb = mp::xml::get_text(ptr3);
-                        }  
-                        else if (!strcmp((const char *) ptr3->name, "id"))
-                        {
-                            s->database = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name, "zurl"))
-                        {
-                            s->target = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name, "sru"))
-                        {
-                            s->sru = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                         "queryEncoding"))
-                        {
-                            s->query_encoding = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                         "piggyback"))
-                        {
-                            s->piggyback = mp::xml::get_bool(ptr3, true);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                         "requestSyntax"))
-                        {
-                            s->request_syntax = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                         "elementSet"))
-                        {
-                            s->element_set = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                         "recordEncoding"))
-                        {
-                            s->record_encoding = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                         "transform"))
-                        {
-                            s->transform_xsl_fname = mp::xml::get_text(ptr3);
-                        }
-                        else if (!strcmp((const char *) ptr3->name,
-                                         "useTurboMarc"))
-                        {
-                            ; // useTurboMarc is ignored
-                        }
-                        else if (!strncmp((const char *) ptr3->name,
-                                          "cclmap_", 7))
-                        {
-                            std::string value = mp::xml::get_text(ptr3);
-                            ccl_qual_fitem(s->ccl_bibset, value.c_str(),
-                                           (const char *) ptr3->name + 7);
+                            throw mp::filter::FilterException
+                                ("No udb for local torus record");
                         }
                     }
-                    return s;
+                }
+                else
+                {
+                    throw mp::filter::FilterException
+                        ("Bad element " 
+                         + std::string((const char *) ptr->name)
+                         + " in zoom filter inside element "
+                         "<torus><records>");
                 }
             }
         }
+        else
+        {
+            throw mp::filter::FilterException
+                ("Bad element " 
+                 + std::string((const char *) ptr->name)
+                 + " in zoom filter inside element <torus>");
+        }
     }
-    return notfound;
 }
 
-void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only)
+void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
+                               const char *path)
 {
+    if (path && *path)
+    {
+        file_path = path;
+    }
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
         if (ptr->type != XML_ELEMENT_NODE)
@@ -439,11 +518,21 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only)
                     torus_url = mp::xml::get_text(attr->children);
                 else if (!strcmp((const char *) attr->name, "xsldir"))
                     xsldir = mp::xml::get_text(attr->children);
+                else if (!strcmp((const char *) attr->name, "element_transform"))
+                    element_transform = mp::xml::get_text(attr->children);
+                else if (!strcmp((const char *) attr->name, "element_raw"))
+                    element_raw = mp::xml::get_text(attr->children);
                 else
                     throw mp::filter::FilterException(
                         "Bad attribute " + std::string((const char *)
                                                        attr->name));
             }
+            configure_local_records(ptr->children, test_only);
+        }
+        else if (!strcmp((const char *) ptr->name, "cclmap"))
+        {
+            const char *addinfo = 0;
+            ccl_xml_config(bibset, ptr, &addinfo);
         }
         else if (!strcmp((const char *) ptr->name, "fieldmap"))
         {
@@ -464,10 +553,6 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only)
             if (cql_field.length())
                 fieldmap[cql_field] = ccl_field;
         }
-        else if (!strcmp((const char *) ptr->name, "records"))
-        {
-            yaz_log(YLOG_WARN, "records ignored!");
-        }
         else
         {
             throw mp::filter::FilterException
@@ -479,38 +564,61 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only)
 }
 
 yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
-    std::string &database, int *error, const char **addinfo)
+    std::string &database, int *error, char **addinfo, ODR odr)
 {
     std::list<BackendPtr>::const_iterator map_it;
     if (m_backend && m_backend->m_frontend_database == database)
         return m_backend;
 
+    const char *sru_proxy = 0;
     std::string db_args;
-    std::string cf_parm;
     std::string torus_db;
     size_t db_arg_pos = database.find(',');
     if (db_arg_pos != std::string::npos)
     {
         torus_db = database.substr(0, db_arg_pos);
-        db_args = database.substr(db_arg_pos+1);
+        db_args = database.substr(db_arg_pos + 1);
     }
     else
         torus_db = database;
  
-    xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db);
-    if (!doc)
+    SearchablePtr sptr;
+
+    std::map<std::string,SearchablePtr>::iterator it;
+    it = m_p->s_map.find(torus_db);
+    if (it != m_p->s_map.end())
+        sptr = it->second;
+    else
     {
-        *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
-        *addinfo = database.c_str();
-        BackendPtr b;
-        return b;
+        xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db);
+        if (!doc)
+        {
+            *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
+            *addinfo = odr_strdup(odr, database.c_str());
+            BackendPtr b;
+            return b;
+        }
+        const xmlNode *ptr = xmlDocGetRootElement(doc);
+        if (ptr)
+        {   // presumably ptr is a records element node
+            // parse first record in document
+            for (ptr = ptr->children; ptr; ptr = ptr->next)
+            {
+                if (ptr->type == XML_ELEMENT_NODE
+                    && !strcmp((const char *) ptr->name, "record"))
+                {
+                    sptr = m_p->parse_torus_record(ptr);
+                    break;
+                }
+            }
+        }
+        xmlFreeDoc(doc);
     }
-    SearchablePtr sptr = m_p->parse_torus(xmlDocGetRootElement(doc));
-    xmlFreeDoc(doc);
+
     if (!sptr)
     {
         *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
-        *addinfo = database.c_str();
+        *addinfo = odr_strdup(odr, database.c_str());
         BackendPtr b;
         return b;
     }
@@ -518,17 +626,35 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     xsltStylesheetPtr xsp = 0;
     if (sptr->transform_xsl_fname.length())
     {
+        const char *path = 0;
+
+        if (m_p->xsldir.length())
+            path = m_p->xsldir.c_str();
+        else
+            path = m_p->file_path.c_str();
         std::string fname;
 
-        if (m_p->xsldir.length()) 
-            fname = m_p->xsldir + "/" + sptr->transform_xsl_fname;
+        char fullpath[1024];
+        char *cp = yaz_filepath_resolve(sptr->transform_xsl_fname.c_str(),
+                                        path, 0, fullpath);
+        if (cp)
+            fname.assign(cp);
         else
-            fname = sptr->transform_xsl_fname;
+        {
+            *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+            *addinfo = (char *)
+                odr_malloc(odr, 40 + sptr->transform_xsl_fname.length());
+            sprintf(*addinfo, "File could not be read: %s", 
+                    sptr->transform_xsl_fname.c_str());
+            BackendPtr b;
+            return b;
+        }
         xmlDoc *xsp_doc = xmlParseFile(fname.c_str());
         if (!xsp_doc)
         {
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-            *addinfo = "xmlParseFile failed";
+            *addinfo = (char *) odr_malloc(odr, 40 + fname.length());
+            sprintf(*addinfo, "xmlParseFile failed. File: %s", fname.c_str());
             BackendPtr b;
             return b;
         }
@@ -536,7 +662,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         if (!xsp)
         {
             *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
-            *addinfo = "xsltParseStylesheetDoc failed";
+            *addinfo = odr_strdup(odr, "xsltParseStylesheetDoc failed");
             BackendPtr b;
             xmlFreeDoc(xsp_doc);
             return b;
@@ -558,35 +684,93 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
 
     if (sptr->cfAuth.length())
     {
+        // A CF target
         b->set_option("user", sptr->cfAuth.c_str());
-        if (authentication.length())
+        if (db_args.length() == 0)
         {
-            size_t found = authentication.find('/');
-            if (found != std::string::npos)
+            if (authentication.length())
             {
-                cf_parm += "user=" + mp::util::uri_encode(authentication.substr(0, found))
-                    + "&password=" + mp::util::uri_encode(authentication.substr(found+1));
+                // no database (auth) args specified already.. and the
+                // Torus authentication has it.. Generate the args that CF
+                // understands..
+                size_t found = authentication.find('/');
+                if (found != std::string::npos)
+                {
+                    db_args += "user=" + mp::util::uri_encode(authentication.substr(0, found))
+                        + "&password=" + mp::util::uri_encode(authentication.substr(found+1));
+                }
+                else
+                    db_args += "user=" + mp::util::uri_encode(authentication);
+            }
+            if (sptr->cfProxy.length())
+            {
+                if (db_args.length())
+                    db_args += "&";
+                db_args += "proxy=" + mp::util::uri_encode(sptr->cfProxy);
             }
-            else
-                cf_parm += "user=" + mp::util::uri_encode(authentication);
+        }
+        if (sptr->cfSubDb.length())
+        {
+            if (db_args.length())
+                db_args += "&";
+            db_args += "subdatabase=" + mp::util::uri_encode(sptr->cfSubDb);
         }
     }
-    else if (authentication.length())
-        b->set_option("user", authentication.c_str());
-
-    if (sptr->cfProxy.length())
-    {
-        if (cf_parm.length())
-            cf_parm += "&";
-        cf_parm += "proxy=" + mp::util::uri_encode(sptr->cfProxy);
-    }
-    if (sptr->cfSubDb.length())
+    else
     {
-        if (cf_parm.length())
-            cf_parm += "&";
-        cf_parm += "subdatabase=" + mp::util::uri_encode(sptr->cfSubDb);
+        // A non-CF target
+        if (db_args.length())
+        {
+            // user has specified backend authentication
+            const char *param_user = 0;
+            const char *param_password = 0;
+            char **names;
+            char **values;
+            int i;
+            int no_parms = yaz_uri_to_array(db_args.c_str(),
+                                            odr, &names, &values);
+            for (i = 0; i < no_parms; i++)
+            {
+                const char *name = names[i];
+                const char *value = values[i];
+                if (!strcmp(name, "user"))
+                    param_user = value;
+                else if (!strcmp(name, "password"))
+                    param_password = value;
+                else if (!strcmp(name, "proxy"))
+                    sru_proxy = value;
+                else
+                {
+                    BackendPtr notfound;
+                    char *msg = (char*) odr_malloc(odr, strlen(name) + 30);
+                    *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+                    sprintf(msg, "Bad database argument: %s", name);
+                    *addinfo = msg;
+                    return notfound;
+                }
+            }
+            if (param_user && param_password)
+            {
+                char *auth = (char*) odr_malloc(
+                    odr, strlen(param_user) + strlen(param_password) + 2);
+                strcpy(auth, param_user);
+                strcat(auth, "/");
+                strcat(auth, param_password);
+                b->set_option("user", auth);
+            }
+            db_args.clear(); // no arguments to be passed (non-CF)
+        }
+        else
+        {
+            // use authentication from Torus, if given
+            if (authentication.length())
+                b->set_option("user", authentication.c_str());
+        }
     }
 
+    if (sru_proxy)
+        b->set_option("proxy", sru_proxy);
+
     std::string url;
     if (sptr->sru.length())
     {
@@ -599,10 +783,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     }
     if (db_args.length())
         url += "," + db_args;
-    else if (cf_parm.length())
-        url += "," + cf_parm;
     yaz_log(YLOG_LOG, "url=%s", url.c_str());
-    b->connect(url, error, addinfo);
+    b->connect(url, error, addinfo, odr);
     if (*error == 0)
     {
         m_backend = b;
@@ -613,7 +795,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
 Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
                                            Odr_int number_to_present,
                                            int *error,
-                                           const char **addinfo,
+                                           char **addinfo,
                                            Odr_int *number_of_records_returned,
                                            ODR odr,
                                            BackendPtr b,
@@ -622,7 +804,9 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
 {
     *number_of_records_returned = 0;
     Z_Records *records = 0;
-    bool enable_pz2_transform = false;
+    bool enable_pz2_retrieval = false; // whether target profile is used
+    bool enable_pz2_transform = false; // whether XSLT is used as well
+    bool assume_marc8_charset = false;
 
     if (start < 0 || number_to_present <= 0)
         return records;
@@ -635,38 +819,50 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
 
     char oid_name_str[OID_STR_MAX];
     const char *syntax_name = 0;
-
-    if (preferredRecordSyntax)
+    
+    if (preferredRecordSyntax &&
+        !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)
+        && element_set_name)
     {
-        if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)
-            && element_set_name &&
-            !strcmp(element_set_name, "pz2"))
+        if (!strcmp(element_set_name, m_p->element_transform.c_str()))
         {
-            if (b->sptr->request_syntax.length())
-            {
-                syntax_name = b->sptr->request_syntax.c_str();
-                enable_pz2_transform = true;
-            }
+            enable_pz2_retrieval = true;
+            enable_pz2_transform = true;
         }
-        else
+        else if (!strcmp(element_set_name, m_p->element_raw.c_str()))
+        {
+            enable_pz2_retrieval = true;
+        }
+    }
+    
+    if (enable_pz2_retrieval)
+    {
+        if (b->sptr->request_syntax.length())
         {
-            syntax_name =
-                yaz_oid_to_string_buf(preferredRecordSyntax, 0, oid_name_str);
+            syntax_name = b->sptr->request_syntax.c_str();
+            const Odr_oid *syntax_oid = 
+                yaz_string_to_oid(yaz_oid_std(), CLASS_RECSYN, syntax_name);
+            if (!oid_oidcmp(syntax_oid, yaz_oid_recsyn_usmarc)
+                || !oid_oidcmp(syntax_oid, yaz_oid_recsyn_opac))
+                assume_marc8_charset = true;
         }
     }
+    else if (preferredRecordSyntax)
+        syntax_name =
+            yaz_oid_to_string_buf(preferredRecordSyntax, 0, oid_name_str);
 
     b->set_option("preferredRecordSyntax", syntax_name);
 
-    if (enable_pz2_transform)
+    if (enable_pz2_retrieval)
     {
-        element_set_name = "F";
+        element_set_name = 0;
         if (b->sptr->element_set.length())
             element_set_name = b->sptr->element_set.c_str();
     }
 
     b->set_option("elementSetName", element_set_name);
 
-    b->present(start, number_to_present, recs, error, addinfo);
+    b->present(start, number_to_present, recs, error, addinfo, odr);
 
     Odr_int i = 0;
     if (!*error)
@@ -697,26 +893,28 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
                 npr = zget_surrogateDiagRec(odr, odr_database, sur_error,
                                             addinfo);
             }
-            else if (enable_pz2_transform)
+            else if (enable_pz2_retrieval)
             {
                 char rec_type_str[100];
+                const char *record_encoding = 0;
 
-                strcpy(rec_type_str, b->sptr->use_turbomarc ?
-                       "txml" : "xml");
-                
-                // prevent buffer overflow ...
-                if (b->sptr->record_encoding.length() > 0 &&
-                    b->sptr->record_encoding.length() < 
-                    (sizeof(rec_type_str)-20))
+                if (b->sptr->record_encoding.length())
+                    record_encoding = b->sptr->record_encoding.c_str();
+                else if (assume_marc8_charset)
+                    record_encoding = "marc8";
+
+                strcpy(rec_type_str, b->sptr->use_turbomarc ? "txml" : "xml");
+                if (record_encoding)
                 {
                     strcat(rec_type_str, "; charset=");
-                    strcat(rec_type_str, b->sptr->record_encoding.c_str());
+                    strcat(rec_type_str, record_encoding);
                 }
                 
                 int rec_len;
+                xmlChar *xmlrec_buf = 0;
                 const char *rec_buf = ZOOM_record_get(recs[i], rec_type_str,
                                                       &rec_len);
-                if (rec_buf && b->xsp)
+                if (rec_buf && b->xsp && enable_pz2_transform)
                 {
                     xmlDoc *rec_doc = xmlParseMemory(rec_buf, rec_len);
                     if (rec_doc)
@@ -725,13 +923,39 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
                         rec_res = xsltApplyStylesheet(b->xsp, rec_doc, 0);
 
                         if (rec_res)
-                            xsltSaveResultToString((xmlChar **) &rec_buf, &rec_len,
+                            xsltSaveResultToString(&xmlrec_buf, &rec_len,
                                                    rec_res, b->xsp);
+                        rec_buf = (const char *) xmlrec_buf;
+                        xmlFreeDoc(rec_doc);
+                        xmlFreeDoc(rec_res);
                     }
                 }
 
                 if (rec_buf)
                 {
+                    xmlDoc *doc = xmlParseMemory(rec_buf, rec_len);
+                    std::string res = 
+                        mp::xml::url_recipe_handle(doc, b->sptr->urlRecipe);
+                    if (res.length())
+                    {
+                        xmlNode *ptr = xmlDocGetRootElement(doc);
+                        while (ptr && ptr->type != XML_ELEMENT_NODE)
+                            ptr = ptr->next;
+                        xmlNode *c = 
+                            xmlNewChild(ptr, 0, BAD_CAST "generated-url", 0);
+                        xmlNode * t = xmlNewText(BAD_CAST res.c_str());
+                        xmlAddChild(c, t);
+
+                        if (xmlrec_buf)
+                            xmlFree(xmlrec_buf);
+
+                        xmlDocDumpMemory(doc, &xmlrec_buf, &rec_len);
+                        rec_buf = (const char *) xmlrec_buf;
+                    }
+                    xmlFreeDoc(doc);
+                }
+                if (rec_buf)
+                {
                     npr = (Z_NamePlusRecord *) odr_malloc(odr, sizeof(*npr));
                     npr->databaseName = odr_database;
                     npr->which = Z_NamePlusRecord_databaseRecord;
@@ -745,6 +969,8 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
                         YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
                         rec_type_str);
                 }
+                if (xmlrec_buf)
+                    xmlFree(xmlrec_buf);
             }
             else
             {
@@ -823,14 +1049,13 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package)
     }
 
     int error = 0;
-    const char *addinfo = 0;
+    char *addinfo = 0;
     std::string db(sr->databaseNames[0]);
-    BackendPtr b = get_backend_from_databases(db, &error, &addinfo);
+    BackendPtr b = get_backend_from_databases(db, &error, &addinfo, odr);
     if (error)
     {
         apdu_res = 
-            odr.create_searchResponse(
-                apdu_req, error, addinfo);
+            odr.create_searchResponse(apdu_req, error, addinfo);
         package.response() = apdu_res;
         return;
     }
@@ -954,29 +1179,40 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package)
     assert(pqf_wrbuf);
     if (b->get_option("sru"))
     {
-        cql_transform_t cqlt = cql_transform_create();
+        int status = 0;
         Z_RPNQuery *zquery;
-        WRBUF wrb = wrbuf_alloc();
-        int status;
-        
         zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf));
-        status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery);
-        
-        cql_transform_close(cqlt);
-
+        WRBUF wrb = wrbuf_alloc();
+            
+        if (!strcmp(b->get_option("sru"), "solr"))
+        {
+            solr_transform_t cqlt = solr_transform_create();
+            
+            status = solr_transform_rpn2solr_wrbuf(cqlt, wrb, zquery);
+            
+            solr_transform_close(cqlt);
+        }
+        else
+        {
+            cql_transform_t cqlt = cql_transform_create();
+            
+            status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery);
+            
+            cql_transform_close(cqlt);
+        }
         if (status == 0)
         {
             yaz_log(YLOG_LOG, "search CQL: %s", wrbuf_cstr(wrb));
-            b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo);
+            b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo, odr);
         }
-
+        
         wrbuf_destroy(wrb);
         wrbuf_destroy(pqf_wrbuf);
         if (status)
         {
             apdu_res = 
                 odr.create_searchResponse(apdu_req, YAZ_BIB1_MALFORMED_QUERY,
-                                          "can not convert from RPN to CQL");
+                                          "can not convert from RPN to CQL/SOLR");
             package.response() = apdu_res;
             return;
         }
@@ -984,7 +1220,7 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package)
     else
     {
         yaz_log(YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf));
-        b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo);
+        b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo, odr);
         wrbuf_destroy(pqf_wrbuf);
     }
     
@@ -1037,7 +1273,7 @@ void yf::Zoom::Frontend::handle_present(mp::Package &package)
         element_set_name = comp->u.simple->u.generic;
     Odr_int number_of_records_returned = 0;
     int error = 0;
-    const char *addinfo = 0;
+    char *addinfo = 0;
     Z_Records *records = get_records(
         *pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested,
         &error, &addinfo, &number_of_records_returned, odr, m_backend,