X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=67eb01e667cd8b34915a95a1b85beeee0cdfe7ad;hb=ada737df8a221496581267f17f011e0c7c26d2fb;hp=bf126809abeb8fd34ce8cdef4e92e105f7af8612;hpb=42b324e99ca943e6bed560e3021219d513672ca2;p=metaproxy-moved-to-github.git

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index bf12680..67eb01e 100644
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 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
@@ -51,6 +51,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/sortspec.h>
 #include <yaz/tokenizer.h>
 #include <yaz/zoom.h>
+#include <yaz/otherinfo.h>
+#include <yaz/match_glob.h>
 
 namespace mp = metaproxy_1;
 namespace yf = mp::filter;
@@ -60,6 +62,8 @@ namespace metaproxy_1 {
         class Zoom::Searchable : boost::noncopyable {
           public:
             std::string authentication;
+            std::string authenticationMode;
+            std::string contentAuthentication;
             std::string cfAuth;
             std::string cfProxy;
             std::string cfSubDB;
@@ -76,7 +80,9 @@ namespace metaproxy_1 {
             std::string urlRecipe;
             std::string contentConnector;
             std::string sortStrategy;
+            std::string extraArgs;
             std::string rpn2cql_fname;
+            std::string retry_on_failure;
             bool use_turbomarc;
             bool piggyback;
             CCL_bibset ccl_bibset;
@@ -100,16 +106,18 @@ namespace metaproxy_1 {
             xmlDoc *explain_doc;
             std::string m_proxy;
             cql_transform_t cqlt;
+            std::string retry_on_failure;
         public:
             Backend();
             ~Backend();
             void connect(std::string zurl, int *error, char **addinfo,
                          ODR odr);
             void search(ZOOM_query q, Odr_int *hits,
-                        int *error, char **addinfo, ODR odr);
+                        int *error, char **addinfo, Z_FacetList **fl, ODR odr);
             void present(Odr_int start, Odr_int number, ZOOM_record *recs,
                          int *error, char **addinfo, ODR odr);
             void set_option(const char *name, const char *value);
+            void set_option(const char *name, const char *value, size_t l);
             void set_option(const char *name, std::string value);
             const char *get_option(const char *name);
             void get_zoom_error(int *error, char **addinfo, ODR odr);
@@ -124,7 +132,6 @@ namespace metaproxy_1 {
             BackendPtr m_backend;
             void handle_package(mp::Package &package);
             void handle_search(mp::Package &package);
-
             void auth(mp::Package &package, Z_InitRequest *req,
                       int *error, char **addinfo, ODR odr);
 
@@ -152,7 +159,7 @@ namespace metaproxy_1 {
                                         std::string authentication,
                                         std::string proxy,
                                         std::string realm);
-            
+
             void prepare_elements(BackendPtr b,
                                   Odr_oid *preferredRecordSyntax,
                                   const char *element_set_name,
@@ -181,7 +188,7 @@ namespace metaproxy_1 {
                                            const char *element_set_name);
             bool retry(mp::Package &package,
                        mp::odr &odr,
-                       BackendPtr b, 
+                       BackendPtr b,
                        int &error, char **addinfo,
                        int &proxy_step, int &same_retries,
                        int &proxy_retries);
@@ -209,13 +216,15 @@ namespace metaproxy_1 {
             void release_frontend(mp::Package &package);
             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;            
+            std::map<mp::Session, FrontendPtr> m_clients;
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
             std::string torus_searchable_url;
             std::string torus_content_url;
             std::string torus_auth_url;
+            std::string torus_allow_ip;
             std::string default_realm;
+            std::string torus_auth_hostname;
             std::map<std::string,std::string> fieldmap;
             std::string xsldir;
             std::string file_path;
@@ -226,6 +235,7 @@ namespace metaproxy_1 {
             CCL_bibset bibset;
             std::string element_transform;
             std::string element_raw;
+            std::string element_passthru;
             std::string proxy;
             xsltStylesheetPtr explain_xsp;
             xsltStylesheetPtr record_xsp;
@@ -249,7 +259,7 @@ static xmlNode *xml_node_search(xmlNode *ptr, int *num, int m)
                 return ptr;
         }
         else  // else: we don't want to find nested nodes
-        {   
+        {
             xmlNode *ret_node = xml_node_search(ptr->children, num, m);
             if (ret_node)
                 return ret_node;
@@ -260,7 +270,7 @@ static xmlNode *xml_node_search(xmlNode *ptr, int *num, int m)
 }
 
 // define Pimpl wrapper forwarding to Impl
- 
+
 yf::Zoom::Zoom() : m_p(new Impl)
 {
 }
@@ -292,6 +302,7 @@ yf::Zoom::Backend::Backend()
     enable_cproxy = true;
     enable_explain = false;
     explain_doc = 0;
+    cqlt = 0;
 }
 
 yf::Zoom::Backend::~Backend()
@@ -318,14 +329,14 @@ void yf::Zoom::Backend::get_zoom_error(int *error, char **addinfo,
     {
         if (!dset)
             dset = "Unknown";
-        
+
         if (!strcmp(dset, "info:srw/diagnostic/1"))
             *error = yaz_diag_srw_to_bib1(error0);
         else if (!strcmp(dset, "Bib-1"))
             *error = error0;
         else if (!strcmp(dset, "ZOOM"))
         {
-            *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;                
+            *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
             if (error0 == ZOOM_ERROR_INIT)
                 *error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
             else if (error0 == ZOOM_ERROR_DECODE)
@@ -340,7 +351,7 @@ void yf::Zoom::Backend::get_zoom_error(int *error, char **addinfo,
         }
         else
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-        
+
         *addinfo = (char *) odr_malloc(
             odr, 30 + strlen(dset) + strlen(msg) +
             (zoom_addinfo ? strlen(zoom_addinfo) : 0));
@@ -358,20 +369,93 @@ void yf::Zoom::Backend::connect(std::string zurl,
                                 int *error, char **addinfo,
                                 ODR odr)
 {
+    size_t h = zurl.find_first_of('#');
+    if (h != std::string::npos)
+        zurl.erase(h);
     ZOOM_connection_connect(m_connection, zurl.length() ? zurl.c_str() : 0, 0);
     get_zoom_error(error, addinfo, odr);
+
 }
 
 void yf::Zoom::Backend::search(ZOOM_query q, Odr_int *hits,
-                               int *error, char **addinfo, ODR odr)
+                               int *error, char **addinfo, Z_FacetList **flp,
+                               ODR odr)
 {
     ZOOM_resultset_destroy(m_resultset);
+    m_resultset = 0;
+    if (*flp)
+    {
+        WRBUF w = wrbuf_alloc();
+        yaz_facet_list_to_wrbuf(w, *flp);
+        set_option("facets", wrbuf_cstr(w));
+        wrbuf_destroy(w);
+    }
     m_resultset = ZOOM_connection_search(m_connection, q);
     get_zoom_error(error, addinfo, odr);
     if (*error == 0)
         *hits = ZOOM_resultset_size(m_resultset);
     else
         *hits = 0;
+    *flp = 0;
+    size_t num_facets = ZOOM_resultset_facets_size(m_resultset);
+    if (num_facets > 0)
+    {
+        size_t i;
+        Z_FacetList *fl = (Z_FacetList *) odr_malloc(odr, sizeof(*fl));
+        fl->elements = (Z_FacetField **)
+            odr_malloc(odr, num_facets * sizeof(*fl->elements));
+        for (i = 0; i < num_facets; i++)
+        {
+            ZOOM_facet_field ff =
+                ZOOM_resultset_get_facet_field_by_index(m_resultset, i);
+            if (!ff)
+                break;
+            Z_AttributeList *al = (Z_AttributeList *)
+                odr_malloc(odr, sizeof(*al));
+            al->num_attributes = 1;
+            al->attributes = (Z_AttributeElement **)
+                odr_malloc(odr, sizeof(*al->attributes));
+            Z_AttributeElement *ae = al->attributes[0] = (Z_AttributeElement *)
+                odr_malloc(odr, sizeof(**al->attributes));
+            ae->attributeSet = 0;
+            ae->attributeType = odr_intdup(odr, 1);
+            ae->which = Z_AttributeValue_complex;
+            ae->value.complex = (Z_ComplexAttribute *)
+                odr_malloc(odr, sizeof(*ae->value.complex));
+            ae->value.complex->num_list = 1;
+            ae->value.complex->list = (Z_StringOrNumeric **)
+                odr_malloc(odr, sizeof(**ae->value.complex->list));
+            ae->value.complex->list[0] = (Z_StringOrNumeric *)
+                odr_malloc(odr, sizeof(**ae->value.complex->list));
+            ae->value.complex->list[0]->which = Z_StringOrNumeric_string;
+            ae->value.complex->list[0]->u.string =
+                odr_strdup(odr, ZOOM_facet_field_name(ff));
+            ae->value.complex->num_semanticAction = 0;
+            ae->value.complex->semanticAction = 0;
+
+            int num_terms = ZOOM_facet_field_term_count(ff);
+            fl->elements[i] = (Z_FacetField *)
+                odr_malloc(odr, sizeof(Z_FacetField));
+            fl->elements[i]->attributes = al;
+            fl->elements[i]->num_terms = num_terms;
+            fl->elements[i]->terms = (Z_FacetTerm **)
+                odr_malloc(odr, num_terms * sizeof(Z_FacetTerm *));
+            int j;
+            for (j = 0; j < num_terms; j++)
+            {
+                int freq;
+                const char *a_term = ZOOM_facet_field_get_term(ff, j, &freq);
+                Z_FacetTerm *ft = (Z_FacetTerm *) odr_malloc(odr, sizeof(*ft));
+                ft->term = z_Term_create(odr, Z_Term_general, a_term,
+                                         strlen(a_term));
+                ft->count = odr_intdup(odr, freq);
+
+                fl->elements[i]->terms[j] = ft;
+            }
+        }
+        fl->num = i;
+        *flp = fl;
+    }
 }
 
 void yf::Zoom::Backend::present(Odr_int start, Odr_int number,
@@ -382,6 +466,12 @@ void yf::Zoom::Backend::present(Odr_int start, Odr_int number,
     get_zoom_error(error, addinfo, odr);
 }
 
+
+void yf::Zoom::Backend::set_option(const char *name, const char *value, size_t l)
+{
+    ZOOM_connection_option_setl(m_connection, name, value, l);
+}
+
 void yf::Zoom::Backend::set_option(const char *name, const char *value)
 {
     ZOOM_connection_option_set(m_connection, name, value);
@@ -404,6 +494,7 @@ yf::Zoom::Searchable::Searchable(CCL_bibset base)
     piggyback = true;
     use_turbomarc = true;
     sortStrategy = "embed";
+    retry_on_failure = "1"; // existing default (should have been false)
     ccl_bibset = ccl_qual_dup(base);
 }
 
@@ -412,7 +503,7 @@ yf::Zoom::Searchable::~Searchable()
     ccl_qual_rm(&ccl_bibset);
 }
 
-yf::Zoom::Frontend::Frontend(Impl *impl) : 
+yf::Zoom::Frontend::Frontend(Impl *impl) :
     m_p(impl), m_is_virtual(false), m_in_use(true)
 {
 }
@@ -426,13 +517,13 @@ yf::Zoom::FrontendPtr yf::Zoom::Impl::get_frontend(mp::Package &package)
     boost::mutex::scoped_lock lock(m_mutex);
 
     std::map<mp::Session,yf::Zoom::FrontendPtr>::iterator it;
-    
+
     while(true)
     {
         it = m_clients.find(package.session());
         if (it == m_clients.end())
             break;
-        
+
         if (!it->second->m_in_use)
         {
             it->second->m_in_use = true;
@@ -450,7 +541,7 @@ void yf::Zoom::Impl::release_frontend(mp::Package &package)
 {
     boost::mutex::scoped_lock lock(m_mutex);
     std::map<mp::Session,yf::Zoom::FrontendPtr>::iterator it;
-    
+
     it = m_clients.find(package.session());
     if (it != m_clients.end())
     {
@@ -467,7 +558,8 @@ void yf::Zoom::Impl::release_frontend(mp::Package &package)
 }
 
 yf::Zoom::Impl::Impl() :
-    apdu_log(false), element_transform("pz2") , element_raw("raw"),
+    apdu_log(false), element_transform("pz2") , element_raw("raw") ,
+    element_passthru("F"),
     zoom_timeout("40"), proxy_timeout(1)
 {
     bibset = ccl_qual_mk();
@@ -487,7 +579,7 @@ yf::Zoom::Impl::~Impl()
 yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
 {
     Zoom::SearchablePtr s(new Searchable(bibset));
-    
+
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
         if (ptr->type != XML_ELEMENT_NODE)
@@ -500,25 +592,35 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
             s->authentication = mp::xml::get_text(ptr);
         }
         else if (!strcmp((const char *) ptr->name,
+                         "authenticationMode"))
+        {
+            s->authenticationMode = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name,
+                         "contentAuthentication"))
+        {
+            s->contentAuthentication = 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,
                          "contentConnector"))
         {
             s->contentConnector = mp::xml::get_text(ptr);
-        }  
+        }
         else if (!strcmp((const char *) ptr->name, "udb"))
         {
             s->udb = mp::xml::get_text(ptr);
@@ -602,8 +704,18 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
         {
             s->sortStrategy = mp::xml::get_text(ptr);
         }
+        else if (!strcmp((const char *) ptr->name,
+                          "extraArgs"))
+        {
+            s->extraArgs = mp::xml::get_text(ptr);
+        }
         else if (!strcmp((const char *) ptr->name, "rpn2cql"))
             s->rpn2cql_fname = mp::xml::get_text(ptr);
+        else if (!strcmp((const char *) ptr->name,
+                          "retryOnFailure"))
+        {
+            s->retry_on_failure = mp::xml::get_text(ptr);
+        }
     }
     return s;
 }
@@ -612,7 +724,7 @@ 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"))
@@ -639,7 +751,7 @@ void yf::Zoom::Impl::configure_local_records(const xmlNode *ptr, bool test_only)
                 else
                 {
                     throw mp::filter::FilterException
-                        ("Bad element " 
+                        ("Bad element "
                          + std::string((const char *) ptr->name)
                          + " in zoom filter inside element "
                          "<torus><records>");
@@ -649,7 +761,7 @@ void yf::Zoom::Impl::configure_local_records(const xmlNode *ptr, bool test_only)
         else
         {
             throw mp::filter::FilterException
-                ("Bad element " 
+                ("Bad element "
                  + std::string((const char *) ptr->name)
                  + " in zoom filter inside element <torus>");
         }
@@ -681,14 +793,20 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
                     torus_content_url = mp::xml::get_text(attr->children);
                 else if (!strcmp((const char *) attr->name, "auth_url"))
                     torus_auth_url = mp::xml::get_text(attr->children);
+                else if (!strcmp((const char *) attr->name, "allow_ip"))
+                    torus_allow_ip = mp::xml::get_text(attr->children);
                 else if (!strcmp((const char *) attr->name, "realm"))
                     default_realm = mp::xml::get_text(attr->children);
+                else if (!strcmp((const char *) attr->name, "auth_hostname"))
+                    torus_auth_hostname = 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 if (!strcmp((const char *) attr->name, "element_passthru"))
+                    element_passthru = mp::xml::get_text(attr->children);
                 else if (!strcmp((const char *) attr->name, "proxy"))
                     proxy = mp::xml::get_text(attr->children);
                 else if (!strcmp((const char *) attr->name, "explain_xsl"))
@@ -739,9 +857,9 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
                 {
                     yaz_log(YLOG_WARN,
                             "contentProxy's server attribute is deprecated");
-                    yaz_log(YLOG_LOG, 
+                    yaz_log(YLOG_LOG,
                             "Specify config_file instead. For example:");
-                    yaz_log(YLOG_LOG, 
+                    yaz_log(YLOG_LOG,
                             " content_file=\"/etc/cf-proxy/cproxy.cfg\"");
                     content_proxy_server = mp::xml::get_text(attr->children);
                 }
@@ -756,7 +874,7 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
             }
         }
         else if (!strcmp((const char *) ptr->name, "log"))
-        { 
+        {
             const struct _xmlAttr *attr;
             for (attr = ptr->properties; attr; attr = attr->next)
             {
@@ -786,7 +904,7 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
         else
         {
             throw mp::filter::FilterException
-                ("Bad element " 
+                ("Bad element "
                  + std::string((const char *) ptr->name)
                  + " in zoom filter");
         }
@@ -795,12 +913,12 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
     if (explain_xslt_fname.length())
     {
         const char *path = 0;
-        
+
         if (xsldir.length())
             path = xsldir.c_str();
         else
             path = file_path.c_str();
-        
+
         char fullpath[1024];
         char *cp = yaz_filepath_resolve(explain_xslt_fname.c_str(),
                                         path, 0, fullpath);
@@ -823,19 +941,19 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
             xmlFreeDoc(xsp_doc);
             throw mp::filter::FilterException
                 ("Cannot parse XSLT " + explain_xslt_fname);
-            
+
         }
     }
 
     if (record_xslt_fname.length())
     {
         const char *path = 0;
-        
+
         if (xsldir.length())
             path = xsldir.c_str();
         else
             path = file_path.c_str();
-        
+
         char fullpath[1024];
         char *cp = yaz_filepath_resolve(record_xslt_fname.c_str(),
                                         path, 0, fullpath);
@@ -858,7 +976,7 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only,
             xmlFreeDoc(xsp_doc);
             throw mp::filter::FilterException
                 ("Cannot parse XSLT " + record_xslt_fname);
-            
+
         }
     }
 }
@@ -882,7 +1000,7 @@ bool yf::Zoom::Frontend::create_content_session(mp::Package &package,
             proxyhostname = m_p->content_proxy_server;
             legacy_format = true;
         }
-            
+
         if (m_p->content_tmp_file.length())
             tmp_file = m_p->content_tmp_file;
 
@@ -912,7 +1030,7 @@ bool yf::Zoom::Frontend::create_content_session(mp::Package &package,
                         while (*cp == ' ')
                             cp++;
                         if (!strcmp(buf, "proxyhostname"))
-                            proxyhostname = cp; 
+                            proxyhostname = cp;
                         if (!strcmp(buf, "sessiondir") && *cp)
                         {
                             if (cp[strlen(cp)-1] == '/')
@@ -929,8 +1047,8 @@ bool yf::Zoom::Frontend::create_content_session(mp::Package &package,
                             "unable to open content config %s",
                             m_p->content_config_file.c_str());
                 *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-                *addinfo = (char *)  odr_malloc(odr, 60 + tmp_file.length());
-                sprintf(*addinfo, "unable to open content config %s",
+                *addinfo = (char *)  odr_malloc(odr, 70 + tmp_file.length());
+                sprintf(*addinfo, "zoom: unable to open content config %s",
                         m_p->content_config_file.c_str());
                 return false;
             }
@@ -954,7 +1072,7 @@ bool yf::Zoom::Frontend::create_content_session(mp::Package &package,
             package.log("zoom", YLOG_WARN, "bad tmp_file %s", tmp_file.c_str());
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
             *addinfo = (char *)  odr_malloc(odr, 60 + tmp_file.length());
-            sprintf(*addinfo, "bad format of content tmp_file: %s",
+            sprintf(*addinfo, "zoom: bad format of content tmp_file: %s",
                     tmp_file.c_str());
             xfree(fname);
             return false;
@@ -972,8 +1090,8 @@ bool yf::Zoom::Frontend::create_content_session(mp::Package &package,
         {
             package.log("zoom", YLOG_WARN|YLOG_ERRNO, "create %s", fname);
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-            *addinfo = (char *)  odr_malloc(odr, 40 + strlen(fname));
-            sprintf(*addinfo, "Could not create %s", fname);
+            *addinfo = (char *) odr_malloc(odr, 50 + strlen(fname));
+            sprintf(*addinfo, "zoom: could not create %s", fname);
             xfree(fname);
             return false;
         }
@@ -1004,7 +1122,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     std::string proxy;
 
     std::list<BackendPtr>::const_iterator map_it;
-    if (m_backend && !m_backend->enable_explain && 
+    if (m_backend && !m_backend->enable_explain &&
         m_backend->m_frontend_database == database)
     {
         connection_reuse = true;
@@ -1022,8 +1140,6 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     else
         torus_db = database;
 
-    std::string authentication;
-    std::string content_authentication;
     std::string content_proxy;
     std::string realm = session_realm;
     if (realm.length() == 0)
@@ -1034,6 +1150,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     const char *param_content_user = 0;
     const char *param_content_password = 0;
     const char *param_nocproxy = 0;
+    const char *param_retry = 0;
     int no_parms = 0;
 
     char **names;
@@ -1047,7 +1164,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         odr_malloc(odr, (10 + no_parms) * sizeof(*out_names));
     const char **out_values = (const char **)
         odr_malloc(odr, (10 + no_parms) * sizeof(*out_values));
-    
+
     // may be changed if it's a content connection
     std::string torus_url = m_p->torus_searchable_url;
     int i;
@@ -1069,6 +1186,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
             content_proxy = value;
         else if (!strcmp(name, "nocproxy"))
             param_nocproxy = value;
+        else if (!strcmp(name, "retry"))
+            param_retry = value;
         else if (!strcmp(name, "proxy"))
         {
             char **dstr;
@@ -1094,7 +1213,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
                 else
                 {
                     proxy = dstr[*proxy_step];
-                    
+
                     (*proxy_step)++;
                     if (*proxy_step == dnum)
                         *proxy_step = 0;
@@ -1121,11 +1240,11 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
             BackendPtr notfound;
             char *msg = (char*) odr_malloc(odr, strlen(name) + 30);
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-            sprintf(msg, "Bad database argument: %s", name);
+            sprintf(msg, "zoom: bad database argument: %s", name);
             *addinfo = msg;
             return notfound;
         }
-    }    
+    }
     if (proxy.length())
         package.log("zoom", YLOG_LOG, "proxy: %s", proxy.c_str());
 
@@ -1135,23 +1254,10 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         return m_backend;
     }
 
-    if (param_user)
-    {
-        authentication = std::string(param_user);
-        if (param_password)
-            authentication += "/" + std::string(param_password);
-    }
-    if (param_content_user)
-    {
-        content_authentication = std::string(param_content_user);
-        if (param_content_password)
-            content_authentication += "/" + std::string(param_content_password);
-    }
-
     if (torus_db.compare("IR-Explain---1") == 0)
         return explain_search(package, database, error, addinfo, odr, torus_url,
                               torus_db, realm);
-    
+
     SearchablePtr sptr;
 
     std::map<std::string,SearchablePtr>::iterator it;
@@ -1160,15 +1266,17 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         sptr = it->second;
     else if (torus_url.length() > 0)
     {
+        std::string torus_addinfo;
         std::string torus_query = "udb==" + torus_db;
         xmlDoc *doc = mp::get_searchable(package,torus_url, torus_db,
                                          torus_query,
-                                         realm, m_p->proxy);
+                                         realm, m_p->proxy,
+                                         torus_addinfo);
         if (!doc)
         {
             *error = YAZ_BIB1_UNSPECIFIED_ERROR;
-            *addinfo = odr_strdup(odr, "Torus server unavailable or "
-                                  "incorrectly configured");
+            if (torus_addinfo.length())
+                *addinfo = odr_strdup(odr, torus_addinfo.c_str());
             BackendPtr b;
             return b;
         }
@@ -1222,7 +1330,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         BackendPtr b;
         return b;
     }
-        
+
     xsltStylesheetPtr xsp = 0;
     if (sptr->transform_xsl_content.length())
     {
@@ -1231,8 +1339,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         if (!xsp_doc)
         {
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-            *addinfo = (char *) odr_malloc(odr, 40);
-            sprintf(*addinfo, "xmlParseMemory failed");
+            *addinfo = odr_strdup(odr, "zoom: xmlParseMemory failed "
+                                  "for literalTransform XSL");
             BackendPtr b;
             return b;
         }
@@ -1240,7 +1348,9 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         if (!xsp)
         {
             *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
-            *addinfo = odr_strdup(odr, "xsltParseStylesheetDoc failed");
+            *addinfo =
+                odr_strdup(odr,"zoom: xsltParseStylesheetDoc failed "
+                           "for literalTransform XSL");
             BackendPtr b;
             xmlFreeDoc(xsp_doc);
             return b;
@@ -1266,7 +1376,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
             *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", 
+            sprintf(*addinfo, "zoom: could not open file %s",
                     sptr->transform_xsl_fname.c_str());
             BackendPtr b;
             return b;
@@ -1275,16 +1385,19 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
         if (!xsp_doc)
         {
             *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-            *addinfo = (char *) odr_malloc(odr, 40 + fname.length());
-            sprintf(*addinfo, "xmlParseFile failed. File: %s", fname.c_str());
+            *addinfo = (char *) odr_malloc(odr, 50 + fname.length());
+            sprintf(*addinfo, "zoom: xmlParseFile failed for file %s",
+                    fname.c_str());
             BackendPtr b;
             return b;
         }
         xsp = xsltParseStylesheetDoc(xsp_doc);
         if (!xsp)
         {
-            *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
-            *addinfo = odr_strdup(odr, "xsltParseStylesheetDoc failed");
+            *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+            *addinfo = (char *) odr_malloc(odr, 50 + fname.length());
+            sprintf(*addinfo, "zoom: xsltParseStylesheetDoc failed "
+                    "for file %s", fname.c_str());
             BackendPtr b;
             xmlFreeDoc(xsp_doc);
             return b;
@@ -1306,7 +1419,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     if (!cqlt)
     {
         *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-        *addinfo = odr_strdup(odr, "Missing/invalid cql2rpn file");
+        *addinfo = odr_strdup(odr, "zoom: missing/invalid cql2rpn file");
         BackendPtr b;
         xsltFreeStylesheet(xsp);
         return b;
@@ -1322,12 +1435,19 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     b->m_frontend_database = database;
     b->enable_cproxy = param_nocproxy ? false : true;
 
+    if (param_retry)
+        b->retry_on_failure = param_retry;
+    else
+        b->retry_on_failure = b->sptr->retry_on_failure;
+
     if (sptr->query_encoding.length())
         b->set_option("rpnCharset", sptr->query_encoding);
 
+    std::string extraArgs = sptr->extraArgs;
+
     b->set_option("timeout", m_p->zoom_timeout.c_str());
-    
-    if (m_p->apdu_log) 
+
+    if (m_p->apdu_log)
         b->set_option("apdulog", "1");
 
     if (sptr->piggyback && sptr->sru.length())
@@ -1335,18 +1455,40 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
                                         maximumRecords > 0 */
     b->set_option("piggyback", sptr->piggyback ? "1" : "0");
 
-    if (authentication.length() == 0)
-        authentication = sptr->authentication;
+    std::string authentication = sptr->authentication;
+    if (param_user)
+    {
+        authentication = std::string(param_user);
+        if (param_password)
+            authentication += "/" + std::string(param_password);
+    }
+    std::string content_authentication = sptr->contentAuthentication;
+    if (param_content_user)
+    {
+        content_authentication = std::string(param_content_user);
+        if (param_content_password)
+            content_authentication += "/" + std::string(param_content_password);
+    }
 
     if (proxy.length() == 0)
         proxy = sptr->cfProxy;
     b->m_proxy = proxy;
-    
+
     if (sptr->cfAuth.length())
     {
         // A CF target
         b->set_option("user", sptr->cfAuth);
-        if (authentication.length())
+        if (param_user)
+        {
+            out_names[no_out_args] = "user";
+            out_values[no_out_args++] = odr_strdup(odr, param_user);
+            if (param_password)
+            {
+                out_names[no_out_args] = "password";
+                out_values[no_out_args++] = odr_strdup(odr, param_password);
+            }
+        }
+        else if (authentication.length())
         {
             size_t found = authentication.find('/');
             if (found != std::string::npos)
@@ -1364,7 +1506,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
                 out_names[no_out_args] = "user";
                 out_values[no_out_args++] =
                     odr_strdup(odr, authentication.c_str());
-            }                
+            }
         }
         if (proxy.length())
         {
@@ -1376,6 +1518,9 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
             out_names[no_out_args] = "subdatabase";
             out_values[no_out_args++] = odr_strdup(odr, sptr->cfSubDB.c_str());
         }
+        if (!param_nocproxy && b->sptr->contentConnector.length())
+            param_nocproxy = "1";
+
         if (param_nocproxy)
         {
             out_names[no_out_args] = "nocproxy";
@@ -1384,37 +1529,51 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     }
     else
     {
-        size_t found = authentication.find('/');
-        
-        if (sptr->sru.length() && found != std::string::npos)
+        const char *auth = authentication.c_str();
+        const char *cp1 = strchr(auth, ' ');
+        if (!cp1 && sptr->sru.length())
+            cp1 =  strchr(auth, '/');
+        if (!cp1)
         {
-            b->set_option("user", authentication.substr(0, found));
-            b->set_option("password", authentication.substr(found+1));
+            /* Z39.50 user/password style, or no password for SRU */
+            b->set_option("user", auth);
         }
         else
-            b->set_option("user", authentication);
+        {
+            /* now consider group as well */
+            const char *cp2 = strchr(cp1 + 1, ' ');
 
+            b->set_option("user", auth, cp1 - auth);
+            if (!cp2)
+                b->set_option("password", cp1 + 1);
+            else
+            {
+                b->set_option("group", cp1 + 1, cp2 - cp1 - 1);
+                b->set_option("password", cp2 + 1);
+            }
+        }
+        if (sptr->authenticationMode.length())
+            b->set_option("authenticationMode", sptr->authenticationMode);
         if (proxy.length())
             b->set_option("proxy", proxy);
     }
-    std::string url;
+    if (extraArgs.length())
+        b->set_option("extraArgs", extraArgs);
+
+    std::string url(sptr->target);
     if (sptr->sru.length())
     {
-        url = "http://" + sptr->target;
         b->set_option("sru", sptr->sru);
-
+        if (url.find("://") == std::string::npos)
+            url = "http://" + url;
         if (sptr->sru_version.length())
             b->set_option("sru_version", sptr->sru_version);
     }
-    else
-    {
-        url = sptr->target;
-    }
     if (no_out_args)
     {
         char *x_args = 0;
         out_names[no_out_args] = 0; // terminate list
-        
+
         yaz_array_to_uri(&x_args, odr, (char **) out_names,
                          (char **) out_values);
         url += "," + std::string(x_args);
@@ -1442,7 +1601,7 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
 {
     char oid_name_str[OID_STR_MAX];
     const char *syntax_name = 0;
-    
+
     if (preferredRecordSyntax &&
         !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml))
     {
@@ -1452,7 +1611,7 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
             enable_pz2_retrieval = true;
             enable_pz2_transform = true;
         }
-        else if (element_set_name && 
+        else if (element_set_name &&
                  !strcmp(element_set_name, m_p->element_raw.c_str()))
         {
             enable_pz2_retrieval = true;
@@ -1464,14 +1623,14 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
             enable_record_transform = true;
         }
     }
-    
+
     if (enable_pz2_retrieval)
     {
         std::string configured_request_syntax = b->sptr->request_syntax;
         if (configured_request_syntax.length())
         {
             syntax_name = configured_request_syntax.c_str();
-            const Odr_oid *syntax_oid = 
+            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))
@@ -1489,9 +1648,15 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
 
     if (enable_pz2_retrieval)
     {
-        element_set_name = 0;
-        if (b->sptr->element_set.length())
-            element_set_name = b->sptr->element_set.c_str();
+        if (element_set_name && !strcmp(element_set_name,
+                                        m_p->element_passthru.c_str()))
+            ;
+        else
+        {
+            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);
@@ -1522,12 +1687,12 @@ Z_Records *yf::Zoom::Frontend::get_explain_records(
         number_to_present = 10000;
 
     xmlNode *ptr = xmlDocGetRootElement(b->explain_doc);
-    
+
     Z_NamePlusRecordList *npl = (Z_NamePlusRecordList *)
         odr_malloc(odr, sizeof(*npl));
     npl->records = (Z_NamePlusRecord **)
         odr_malloc(odr, number_to_present * sizeof(*npl->records));
-    
+
     for (i = 0; i < number_to_present; i++)
     {
         int num = 0;
@@ -1590,7 +1755,7 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
 
     if (start < 0 || number_to_present <=0)
         return records;
-    
+
     if (number_to_present > 10000)
         number_to_present = 10000;
 
@@ -1603,15 +1768,26 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
     if (!*error)
     {
         for (i = 0; i < number_to_present; i++)
+        {
             if (!recs[i])
                 break;
+
+            const char *addinfo;
+            int sur_error = ZOOM_record_error(recs[i], 0 /* msg */,
+                                              &addinfo, 0 /* diagset */);
+            if (sur_error ==
+                YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS && addinfo &&
+                !strcmp(addinfo,
+                        "ZOOM C generated. Present phase and no records"))
+                break;
+        }
     }
     if (i > 0)
     {  // only return records if no error and at least one record
 
         const char *xsl_parms[3];
         mp::wrbuf cproxy_host;
-        
+
         if (b->enable_cproxy && b->cproxy_host.length())
         {
             wrbuf_puts(cproxy_host, "\"");
@@ -1635,14 +1811,14 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
         npl->num_records = i;
         npl->records = (Z_NamePlusRecord **)
             odr_malloc(odr, i * sizeof(*npl->records));
-        for (i = 0; i < number_to_present; i++)
+        for (i = 0; i < npl->num_records; i++)
         {
             Z_NamePlusRecord *npr = 0;
             const char *addinfo;
 
             int sur_error = ZOOM_record_error(recs[i], 0 /* msg */,
                                               &addinfo, 0 /* diagset */);
-                
+
             if (sur_error)
             {
                 log_diagnostic(package, sur_error, addinfo);
@@ -1700,7 +1876,7 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
                             odr, odr_database, error, addinfo);
                     }
                     else
-                    { 
+                    {
                         // first stage XSLT - per target
                         xsltStylesheetPtr xsp = b->xsp;
                         xmlDoc *rec_res = xsltApplyStylesheet(xsp, rec_doc,
@@ -1708,7 +1884,7 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
                         // insert generated-url
                         if (rec_res)
                         {
-                            std::string res = 
+                            std::string res =
                                 mp::xml::url_recipe_handle(rec_res,
                                                            b->sptr->urlRecipe);
                             if (res.length())
@@ -1716,7 +1892,7 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
                                 xmlNode *ptr = xmlDocGetRootElement(rec_res);
                                 while (ptr && ptr->type != XML_ELEMENT_NODE)
                                     ptr = ptr->next;
-                                xmlNode *c = 
+                                xmlNode *c =
                                     xmlNewChild(ptr, 0, BAD_CAST "metadata", 0);
                                 xmlNewProp(c, BAD_CAST "type", BAD_CAST
                                            "generated-url");
@@ -1765,7 +1941,7 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
                 {
                     if (!rec_buf)
                         npr = zget_surrogateDiagRec(
-                            odr, odr_database, 
+                            odr, odr_database,
                             YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
                             rec_type_str);
                     else
@@ -1795,7 +1971,7 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
                 else
                 {
                     npr = zget_surrogateDiagRec(
-                        odr, odr_database, 
+                        odr, odr_database,
                         YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
                         "ZOOM_record, type ext");
                 }
@@ -1869,7 +2045,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package,
 
     b->m_frontend_database = database;
     b->enable_explain = true;
-   
+
     Z_GDU *gdu = package.request().get();
     Z_APDU *apdu_req = gdu->u.z3950;
     Z_SearchRequest *sr = apdu_req->u.searchRequest;
@@ -1886,10 +2062,12 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package,
     else if (query->which == Z_Query_type_104 &&
         query->u.type_104->which == Z_External_CQL)
     {
+        std::string torus_addinfo;
         std::string torus_query(query->u.type_104->u.cql);
         xmlDoc *doc = mp::get_searchable(package, torus_url, "",
                                          torus_query,
-                                         realm, m_p->proxy);
+                                         realm, m_p->proxy,
+                                         torus_addinfo);
         if (m_p->explain_xsp)
         {
             xmlDoc *rec_res =  xsltApplyStylesheet(m_p->explain_xsp, doc, 0);
@@ -1900,14 +2078,14 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package,
         if (!doc)
         {
             *error = YAZ_BIB1_UNSPECIFIED_ERROR;
-            *addinfo = odr_strdup(odr, "Torus server unavailable or "
-                                  "incorrectly configured");
+            if (torus_addinfo.length())
+                *addinfo = odr_strdup(odr, torus_addinfo.c_str());
         }
         else
         {
             xmlNode *ptr = xmlDocGetRootElement(doc);
             int hits = 0;
-            
+
             xml_node_search(ptr, &hits, 0);
 
             Z_APDU *apdu_res = odr.create_searchResponse(apdu_req, 0, 0);
@@ -1933,14 +2111,14 @@ static bool wait_conn(COMSTACK cs, int secs)
     struct yaz_poll_fd pfd;
 
     yaz_poll_add(pfd.input_mask, yaz_poll_except);
-    if (cs->io_pending && CS_WANT_WRITE)
+    if (cs->io_pending & CS_WANT_WRITE)
         yaz_poll_add(pfd.input_mask, yaz_poll_write);
     if (cs->io_pending & CS_WANT_READ)
         yaz_poll_add(pfd.input_mask, yaz_poll_read);
 
     pfd.fd = cs_fileno(cs);
     pfd.client_data = 0;
-    
+
     int ret = yaz_poll(&pfd, 1, secs, 0);
     return ret > 0;
 }
@@ -1959,12 +2137,12 @@ bool yf::Zoom::Impl::check_proxy(const char *proxy)
 
     Z_GDU *gdu = z_get_HTTP_Request_uri(odr, uri, 0, 1);
     gdu->u.HTTP_Request->method = odr_strdup(odr, "GET");
-    
+
     if (z_GDU(odr, &gdu, 0, 0))
     {
         int len;
         char *buf = odr_getbuf(odr, &len, 0);
-        
+
         int ret = cs_connect(conn, add);
         if (ret > 0 || (ret == 0 && wait_conn(conn, 1)))
         {
@@ -1986,7 +2164,7 @@ bool yf::Zoom::Impl::check_proxy(const char *proxy)
 
 bool yf::Zoom::Frontend::retry(mp::Package &package,
                                mp::odr &odr,
-                               BackendPtr b, 
+                               BackendPtr b,
                                int &error, char **addinfo,
                                int &proxy_step, int &same_retries,
                                int &proxy_retries)
@@ -2005,7 +2183,8 @@ bool yf::Zoom::Frontend::retry(mp::Package &package,
         error = YAZ_BIB1_PROXY_FAILURE;
         *addinfo = odr_strdup(odr, b->m_proxy.c_str());
     }
-    else if (same_retries == 0 && proxy_retries == 0)
+    else if (b && b->retry_on_failure.compare("0")
+             && same_retries == 0 && proxy_retries == 0)
     {
         log_diagnostic(package, error, *addinfo);
         same_retries++;
@@ -2103,7 +2282,7 @@ next_proxy:
             error = YAZ_BIB1_MALFORMED_QUERY;
             const char *addinfo = "CQL syntax error";
             log_diagnostic(package, error, addinfo);
-            apdu_res = 
+            apdu_res =
                 odr.create_searchResponse(apdu_req, error, addinfo);
             package.response() = apdu_res;
             return;
@@ -2117,7 +2296,7 @@ next_proxy:
             addinfo = 0;
             if (cn_error->which == CQL_NODE_ST)
                 addinfo = cn_error->u.st.index;
-            
+
             log_diagnostic(package, error, addinfo);
             apdu_res = odr.create_searchResponse(apdu_req, error, addinfo);
             package.response() = apdu_res;
@@ -2156,7 +2335,7 @@ next_proxy:
         yaz_tok_parse_t tp =
             yaz_tok_parse_buf(tc, wrbuf_cstr(sort_spec_wrbuf));
         yaz_tok_cfg_destroy(tc);
-        
+
         /* go through sortspec and map fields */
         int token = yaz_tok_move(tp);
         while (token != YAZ_TOK_EOF)
@@ -2213,7 +2392,7 @@ next_proxy:
             switch (cerror)
             {
             case CCL_ERR_UNKNOWN_QUAL:
-            case CCL_ERR_TRUNC_NOT_LEFT: 
+            case CCL_ERR_TRUNC_NOT_LEFT:
             case CCL_ERR_TRUNC_NOT_RIGHT:
             case CCL_ERR_TRUNC_NOT_BOTH:
 #ifdef CCL_ERR_TRUNC_NOT_EMBED
@@ -2234,54 +2413,53 @@ next_proxy:
         package.log("zoom", YLOG_LOG, "RPN: %s", wrbuf_cstr(pqf_wrbuf));
         ccl_rpn_delete(cn);
     }
-    
+
     assert(pqf_wrbuf.len());
 
     ZOOM_query q = ZOOM_query_create();
     ZOOM_query_sortby2(q, b->sptr->sortStrategy.c_str(), sortkeys.c_str());
 
+    Z_FacetList *fl = 0;
+
+    // Facets for request.. And later for reponse
+    if (!fl)
+        fl = yaz_oi_get_facetlist(&sr->otherInfo);
+    if (!fl)
+        fl = yaz_oi_get_facetlist(&sr->additionalSearchInfo);
+
     if (b->get_option("sru"))
     {
-        int status = 0;
         Z_RPNQuery *zquery;
         zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf));
-        mp::wrbuf wrb;
-            
+        mp::wrbuf wrb_cql;
+        mp::wrbuf wrb_addinfo;
+
         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);
-        }
+            error = solr_transform_rpn2solr_stream_r(b->cqlt, wrb_addinfo,
+                                                     wrbuf_vp_puts, wrb_cql,
+                                                     zquery);
         else
+            error = cql_transform_rpn2cql_stream_r(b->cqlt, wrb_addinfo,
+                                                   wrbuf_vp_puts, wrb_cql,
+                                                   zquery);
+        if (error)
         {
-            status = cql_transform_rpn2cql_wrbuf(b->cqlt, wrb, zquery);
-        }
-        if (status == 0)
-        {
-            ZOOM_query_cql(q, wrbuf_cstr(wrb));
-            package.log("zoom", YLOG_LOG, "CQL: %s", wrbuf_cstr(wrb));
-            b->search(q, &hits, &error, &addinfo, odr);
-        }
-        ZOOM_query_destroy(q);
-        
-        if (status)
-        {
-            error = YAZ_BIB1_MALFORMED_QUERY;
-            const char *addinfo = "can not convert from RPN to CQL/SOLR";
-            log_diagnostic(package, error, addinfo);
-            apdu_res = odr.create_searchResponse(apdu_req, error, addinfo);
+            log_diagnostic(package, error, wrb_addinfo.c_str_null());
+            apdu_res = odr.create_searchResponse(apdu_req, error,
+                                                 wrb_addinfo.c_str_null());
             package.response() = apdu_res;
             return;
         }
+        ZOOM_query_cql(q, wrb_cql.c_str());
+        package.log("zoom", YLOG_LOG, "search CQL: %s", wrb_cql.c_str());
+        b->search(q, &hits, &error, &addinfo, &fl, odr);
+        ZOOM_query_destroy(q);
     }
     else
     {
-        ZOOM_query_prefix(q, wrbuf_cstr(pqf_wrbuf));
-        package.log("zoom", YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf));
-        b->search(q, &hits, &error, &addinfo, odr);
+        ZOOM_query_prefix(q, pqf_wrbuf.c_str());
+        package.log("zoom", YLOG_LOG, "search PQF: %s", pqf_wrbuf.c_str());
+        b->search(q, &hits, &error, &addinfo, &fl, odr);
         ZOOM_query_destroy(q);
     }
 
@@ -2296,7 +2474,7 @@ next_proxy:
     Odr_int number_to_present = 0;
     if (!error)
         mp::util::piggyback_sr(sr, hits, number_to_present, &element_set_name);
-    
+
     Odr_int number_of_records_returned = 0;
     Z_Records *records = get_records(
         package,
@@ -2313,6 +2491,9 @@ next_proxy:
             odr_intdup(odr, number_of_records_returned);
     }
     apdu_res->u.searchResponse->resultCount = odr_intdup(odr, hits);
+    if (fl)
+        yaz_oi_set_facetlist(&apdu_res->u.searchResponse->additionalSearchInfo,
+                             odr, fl);
     package.response() = apdu_res;
 }
 
@@ -2335,7 +2516,7 @@ void yf::Zoom::Frontend::handle_present(mp::Package &package)
     if (comp && comp->which != Z_RecordComp_simple)
     {
         package.response() = odr.create_presentResponse(
-            apdu_req, 
+            apdu_req,
             YAZ_BIB1_PRESENT_COMP_SPEC_PARAMETER_UNSUPP, 0);
         return;
     }
@@ -2353,7 +2534,7 @@ void yf::Zoom::Frontend::handle_present(mp::Package &package)
                 *pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested,
                 &error, &addinfo, &number_of_records_returned, odr, m_backend,
                 pr->preferredRecordSyntax, element_set_name);
-        
+
         apdu_res = odr.create_presentResponse(apdu_req, error, addinfo);
         if (records)
         {
@@ -2370,7 +2551,7 @@ void yf::Zoom::Frontend::handle_present(mp::Package &package)
                         *pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested,
                         &error, &addinfo, &number_of_records_returned, odr, m_backend,
                         pr->preferredRecordSyntax, element_set_name);
-        
+
         apdu_res = odr.create_presentResponse(apdu_req, error, addinfo);
         if (records)
         {
@@ -2430,6 +2611,20 @@ void yf::Zoom::Frontend::handle_package(mp::Package &package)
     }
 }
 
+std::string escape_cql_term(std::string inp)
+{
+    std::string res;
+    size_t l = inp.length();
+    size_t i;
+    for (i = 0; i < l; i++)
+    {
+        if (strchr("*?^\"", inp[i]))
+            res += "\\";
+        res += inp[i];
+    }
+    return res;
+}
+
 void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req,
                               int *error, char **addinfo, ODR odr)
 {
@@ -2462,26 +2657,69 @@ void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req,
             break;
         }
     }
-    // need to dig out IP!!
 
-    if (user.length() == 0 || password.length() == 0)
+    Z_OtherInformation **oi = &req->otherInfo;
+    const char *ip_cstr =
+        yaz_oi_get_string_oid(oi, yaz_oid_userinfo_client_ip, 1, 0);
+    std::string ip;
+    if (ip_cstr)
+        ip = ip_cstr;
+    else
+        ip = package.origin().get_address();
+
+    yaz_log(YLOG_LOG, "IP=%s", ip.c_str());
+
+    {
+        NMEM nmem = nmem_create();
+        char **darray;
+        int i, num;
+        nmem_strsplit_blank(nmem, m_p->torus_allow_ip.c_str(), &darray, &num);
+        for (i = 0; i < num; i++)
+        {
+            yaz_log(YLOG_LOG, "check against %s+%s", darray[i], ip.c_str());
+            if (yaz_match_glob(darray[i], ip.c_str()))
+                break;
+        }
+        nmem_destroy(nmem);
+        if (i < num)
+            return;  /* allow this IP */
+    }
+    std::string torus_query;
+    int failure_code;
+
+    if (user.length() && password.length())
     {
-        *error = YAZ_BIB1_INIT_AC_BAD_USERID_AND_OR_PASSWORD;
-        *addinfo = odr_strdup(odr, "User and password required");
-        return;
+        torus_query = "userName==\"" + escape_cql_term(user) +
+            "\" and password==\"" + escape_cql_term(password) + "\"";
+        failure_code = YAZ_BIB1_INIT_AC_BAD_USERID_AND_OR_PASSWORD;
+    }
+    else
+    {
+        torus_query = "ipRanges encloses/net.ipaddress \"";
+        torus_query += escape_cql_term(std::string(ip));
+        torus_query += "\"";
+
+        if (m_p->torus_auth_hostname.length())
+        {
+            torus_query += " AND hostName == \"";
+            torus_query += escape_cql_term(m_p->torus_auth_hostname);
+            torus_query += "\"";
+        }
+        failure_code = YAZ_BIB1_INIT_AC_BLOCKED_NETWORK_ADDRESS;
     }
 
     std::string dummy_db;
     std::string dummy_realm;
-    std::string torus_query = "userName==" + user + 
-        " and password==" + password;
+    std::string torus_addinfo;
     xmlDoc *doc = mp::get_searchable(package, m_p->torus_auth_url, dummy_db,
-                                     torus_query, dummy_realm, m_p->proxy);
+                                     torus_query, dummy_realm, m_p->proxy,
+                                     torus_addinfo);
     if (!doc)
     {
-        *error = YAZ_BIB1_UNSPECIFIED_ERROR;
-        *addinfo = odr_strdup(odr, "Torus server unavailable or "
-                              "incorrectly configured");
+        // something fundamental broken in lookup.
+        *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+        if (torus_addinfo.length())
+            *addinfo = odr_strdup(odr, torus_addinfo.c_str());
         return;
     }
     const xmlNode *ptr = xmlDocGetRootElement(doc);
@@ -2511,11 +2749,11 @@ void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req,
                 !strcmp((const char *) ptr->name, "identityId"))
                 break;
             ptr = ptr->next;
-        }            
+        }
     }
     if (!ptr)
     {
-        *error = YAZ_BIB1_INIT_AC_BAD_USERID_AND_OR_PASSWORD;
+        *error = failure_code;
         return;
     }
     session_realm = mp::xml::get_text(ptr);
@@ -2535,21 +2773,21 @@ void yf::Zoom::Impl::process(mp::Package &package)
     {
         Z_InitRequest *req = gdu->u.z3950->u.initRequest;
         f->m_init_gdu = gdu;
-        
+
         mp::odr odr;
         Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
         Z_InitResponse *resp = apdu->u.initResponse;
-        
+
         int i;
         static const int masks[] = {
             Z_Options_search,
             Z_Options_present,
-            -1 
+            -1
         };
         for (i = 0; masks[i] != -1; i++)
             if (ODR_MASK_GET(req->options, masks[i]))
                 ODR_MASK_SET(resp->options, masks[i]);
-        
+
         static const int versions[] = {
             Z_ProtocolVersion_1,
             Z_ProtocolVersion_2,
@@ -2561,7 +2799,7 @@ void yf::Zoom::Impl::process(mp::Package &package)
                 ODR_MASK_SET(resp->protocolVersion, versions[i]);
             else
                 break;
-        
+
         *resp->preferredMessageSize = *req->preferredMessageSize;
         *resp->maximumRecordSize = *req->maximumRecordSize;