X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=6d91c5443e71636a3c0bb3caa936c99af7b41cf1;hb=f382c39ab7cdc815ef8320d45dbd878d4f6548f9;hp=b975f509f90124b5949bdef1a2b5e37e410378d2;hpb=1b26df87d5244f5bc093935dedd51cbf6858c703;p=metaproxy-moved-to-github.git

diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp
index b975f50..6d91c54 100644
--- a/src/filter_z3950_client.cpp
+++ b/src/filter_z3950_client.cpp
@@ -55,6 +55,7 @@ namespace metaproxy_1 {
             void failNotify();
             void timeoutNotify();
             void recv_GDU(Z_GDU *gdu, int len);
+            void fixup_nsd(ODR odr, Z_Records *records);
             yazpp_1::IPDU_Observer* sessionNotify(
                 yazpp_1::IPDU_Observable *the_PDU_Observable,
                 int fd);
@@ -168,12 +169,48 @@ void yf::Z3950Client::Assoc::timeoutNotify()
     }
 }
 
+void yf::Z3950Client::Assoc::fixup_nsd(ODR odr, Z_Records *records)
+{
+    if (records && records->which == Z_Records_NSD)
+    {
+        Z_DefaultDiagFormat *nsd = records->u.nonSurrogateDiagnostic;
+        if (nsd->which == Z_DiagRec_defaultFormat)
+        {
+            std::string addinfo;
+
+            if (nsd->u.v2Addinfo)
+            {
+                addinfo.assign(nsd->u.v2Addinfo);
+                addinfo += " ";
+            }
+            addinfo += "(backend=" + m_host + ")";
+            nsd->u.v2Addinfo = odr_strdup(odr, addinfo.c_str());
+        }
+    }
+}
+
 void yf::Z3950Client::Assoc::recv_GDU(Z_GDU *gdu, int len)
 {
     m_waiting = false;
 
     if (m_package)
+    { 
+        mp::odr odr; // must be in scope for response() = assignment
+        if (gdu && gdu->which == Z_GDU_Z3950)
+        {
+            Z_APDU *apdu = gdu->u.z3950;
+            switch (apdu->which)
+            {
+            case Z_APDU_searchResponse:
+                fixup_nsd(odr, apdu->u.searchResponse->records);
+                break;
+            case Z_APDU_presentResponse:
+                fixup_nsd(odr, apdu->u.presentResponse->records);
+                break;
+            }
+        }
         m_package->response() = gdu;
+    }
 }
 
 yazpp_1::IPDU_Observer *yf::Z3950Client::Assoc::sessionNotify(
@@ -386,8 +423,16 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package,
     c->m_waiting = true;
     if (!c->m_connected)
     {
-        c->client(c->m_host.c_str());
+        if (c->client(c->m_host.c_str()))
+        {
+            mp::odr odr;
+            package.response() =
+                odr.create_close(gdu->u.z3950, Z_Close_peerAbort, 0);
+            package.session().close();
+            return;
+        }
         c->timeout(1);  // so timeoutNotify gets called once per second
+        
 
         while (!c->m_destroyed && c->m_waiting 
                && c->m_socket_manager->processEvent() > 0)
@@ -457,7 +502,8 @@ void yf::Z3950Client::process(Package &package) const
     }
 }
 
-void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only)
+void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only,
+                                const char *path)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -465,7 +511,7 @@ void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only)
             continue;
         if (!strcmp((const char *) ptr->name, "timeout"))
         {
-            m_p->m_timeout_sec = mp::xml::get_int(ptr->children, 30);
+            m_p->m_timeout_sec = mp::xml::get_int(ptr, 30);
         }
         else if (!strcmp((const char *) ptr->name, "default_target"))
         {
@@ -477,11 +523,11 @@ void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only)
         }
         else if (!strcmp((const char *) ptr->name, "max-sockets"))
         {
-            m_p->m_max_sockets = mp::xml::get_int(ptr->children, 0);
+            m_p->m_max_sockets = mp::xml::get_int(ptr, 0);
         }
         else if (!strcmp((const char *) ptr->name, "force_close"))
         {
-            m_p->m_force_close = mp::xml::get_bool(ptr->children, 0);
+            m_p->m_force_close = mp::xml::get_bool(ptr, 0);
         }
         else
         {