zoom fix: convert backend SRU diagnostics.

[metaproxy-moved-to-github.git] / src / filter_zoom.cpp

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index 2a08f5f..2ac339d 100644 (file)
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -92,6 +92,7 @@ namespace metaproxy_1 {
             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, std::string value);
             const char *get_option(const char *name);
             void get_zoom_error(int *error, char **addinfo, ODR odr);
         };
@@ -197,7 +198,8 @@ void yf::Zoom::Backend::get_zoom_error(int *error, char **addinfo,
 {
     const char *msg = 0;
     const char *zoom_addinfo = 0;
-    *error = ZOOM_connection_error(m_connection, &msg, &zoom_addinfo);
+    const char *dset = 0;
+    *error = ZOOM_connection_error_x(m_connection, &msg, &zoom_addinfo, &dset);
     if (*error)
     {
         if (*error >= ZOOM_ERROR_CONNECT)
@@ -217,6 +219,8 @@ void yf::Zoom::Backend::get_zoom_error(int *error, char **addinfo,
         }
         else
         {
+            if (dset && !strcmp(dset, "info:srw/diagnostic/1"))
+                *error = yaz_diag_srw_to_bib1(*error);
             *addinfo = (char *) odr_malloc(
                 odr, 20 + (zoom_addinfo ? strlen(zoom_addinfo) : 0));
             **addinfo = '\0';
@@ -280,6 +284,11 @@ void yf::Zoom::Backend::set_option(const char *name, const char *value)
         ZOOM_resultset_option_set(m_resultset, name, value);
 }
 
+void yf::Zoom::Backend::set_option(const char *name, std::string value)
+{
+    set_option(name, value.c_str());
+}
+
 const char *yf::Zoom::Backend::get_option(const char *name)
 {
     return ZOOM_connection_option_get(m_connection, name);
@@ -701,7 +710,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     b->m_frontend_database = database;
 
     if (sptr->query_encoding.length())
-        b->set_option("rpnCharset", sptr->query_encoding.c_str());
+        b->set_option("rpnCharset", sptr->query_encoding);
 
     b->set_option("timeout", "40");
 
@@ -729,6 +738,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
                 param_password = value;
             else if (!strcmp(name, "proxy"))
                 param_proxy = value;
+            else if (!strcmp(name, "cproxysession"))
+                ;
             else
             {
                 BackendPtr notfound;
@@ -739,10 +750,11 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
                 return notfound;
             }
         }
-        if (param_user && param_password)
+        if (param_user)
         {
-            authentication = std::string(param_user)
-                + "/" + std::string(param_password);
+            authentication = std::string(param_user);
+            if (param_password)
+                authentication += "/" + std::string(param_password);
         }
         if (param_proxy)
             proxy = param_proxy;
@@ -751,7 +763,7 @@ 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());
+        b->set_option("user", sptr->cfAuth);
         if (!param_user && !param_password && authentication.length())
         {
             if (db_args.length())
@@ -787,10 +799,18 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     {
         db_args.clear(); // no arguments to be passed (non-CF)
 
-        if (authentication.length())
-            b->set_option("user", authentication.c_str());
+        size_t found = authentication.find('/');
+        
+        if (sptr->sru.length() && found != std::string::npos)
+        {
+            b->set_option("user", authentication.substr(0, found));
+            b->set_option("password", authentication.substr(found+1));
+        }
+        else
+            b->set_option("user", authentication);
+
         if (proxy.length())
-            b->set_option("proxy", proxy.c_str());
+            b->set_option("proxy", proxy);
     }
     if (b->sptr->contentConnector.length())
     {
@@ -835,7 +855,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
     if (sptr->sru.length())
     {
         url = "http://" + sptr->target;
-        b->set_option("sru", sptr->sru.c_str());
+        b->set_option("sru", sptr->sru);
     }
     else
     {
@@ -974,20 +994,52 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
                 xmlChar *xmlrec_buf = 0;
                 const char *rec_buf = ZOOM_record_get(recs[i], rec_type_str,
                                                       &rec_len);
+                if (!rec_buf && !npr)
+                {
+                    std::string addinfo("ZOOM_record_get failed for type ");
+
+                    addinfo += rec_type_str;
+                    npr = zget_surrogateDiagRec(
+                        odr, odr_database, 
+                        YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
+                        addinfo.c_str());
+                }
+
                 if (rec_buf && b->xsp && enable_pz2_transform)
                 {
                     xmlDoc *rec_doc = xmlParseMemory(rec_buf, rec_len);
-                    if (rec_doc)
+                    if (!rec_doc)
+                    {
+                        npr = zget_surrogateDiagRec(
+                            odr, odr_database, 
+                            YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
+                            "xml parse failed for record");
+                    }
+                    else
                     { 
-                        xmlDoc *rec_res;
-                        rec_res = xsltApplyStylesheet(b->xsp, rec_doc, 0);
+                        xmlDoc *rec_res = 
+                            xsltApplyStylesheet(b->xsp, rec_doc, 0);
 
                         if (rec_res)
+                        {
                             xsltSaveResultToString(&xmlrec_buf, &rec_len,
                                                    rec_res, b->xsp);
-                        rec_buf = (const char *) xmlrec_buf;
+                            rec_buf = (const char *) xmlrec_buf;
+
+                            xmlFreeDoc(rec_res);
+                        }
+                        if (!rec_buf)
+                        {
+                            std::string addinfo;
+
+                            addinfo = "xslt apply failed for "
+                                + b->sptr->transform_xsl_fname;
+                            npr = zget_surrogateDiagRec(
+                                odr, odr_database, 
+                                YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
+                                addinfo.c_str());
+                        }
                         xmlFreeDoc(rec_doc);
-                        xmlFreeDoc(rec_res);
                     }
                 }
 
@@ -1026,20 +1078,22 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start,
                     }
                     xmlFreeDoc(doc);
                 }
-                if (rec_buf)
+                if (!npr)
                 {
-                    npr = (Z_NamePlusRecord *) odr_malloc(odr, sizeof(*npr));
-                    npr->databaseName = odr_database;
-                    npr->which = Z_NamePlusRecord_databaseRecord;
-                    npr->u.databaseRecord =
-                        z_ext_record_xml(odr, rec_buf, rec_len);
-                }
-                else
-                {
-                    npr = zget_surrogateDiagRec(
-                        odr, odr_database, 
-                        YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
-                        rec_type_str);
+                    if (!rec_buf)
+                        npr = zget_surrogateDiagRec(
+                            odr, odr_database, 
+                            YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
+                            rec_type_str);
+                    else
+                    {
+                        npr = (Z_NamePlusRecord *)
+                            odr_malloc(odr, sizeof(*npr));
+                        npr->databaseName = odr_database;
+                        npr->which = Z_NamePlusRecord_databaseRecord;
+                        npr->u.databaseRecord =
+                            z_ext_record_xml(odr, rec_buf, rec_len);
+                    }
                 }
                 if (xmlrec_buf)
                     xmlFree(xmlrec_buf);
@@ -1201,6 +1255,13 @@ static void sort_via_cql(WRBUF cql_sortby, const char *sru_sortkeys)
     nmem_destroy(nmem);
 }
 
+#if YAZ_VERSIONL < 0x40206
+static void wrbuf_vp_puts(const char *buf, void *client_data)
+{
+    WRBUF b = (WRBUF) client_data;
+    wrbuf_puts(b, buf);
+}
+#endif
 
 void yf::Zoom::Frontend::handle_search(mp::Package &package)
 {