Modified for new location of YAZ header files. Experimental threaded

[yazpp-moved-to-github.git] / src / yaz-ir-assoc.cpp

diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index b1d8993..358a616 100644 (file)
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -4,7 +4,15 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-ir-assoc.cpp,v $
- * Revision 1.9  1999-04-28 13:29:14  adam
+ * Revision 1.11  1999-12-06 13:52:45  adam
+ * Modified for new location of YAZ header files. Experimental threaded
+ * operation.
+ *
+ * Revision 1.10  1999/04/29 07:33:28  adam
+ * Changed setting of host in connect/proxy setting. YAZ' strtoaddr now
+ * ignores database part of host.
+ *
+ * Revision 1.9  1999/04/28 13:29:14  adam
  * Yet another fix regarding database settings.
  *
  * Revision 1.8  1999/04/28 13:04:03  adam
@@ -24,7 +32,7 @@
 
 #include <assert.h>
 
-#include <log.h>
+#include <yaz/log.h>
 #include <yaz-ir-assoc.h>
 
 Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
@@ -38,6 +46,7 @@ Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
     m_host = 0;
     m_proxy = 0;
     m_cookie = 0;
+    m_log = LOG_DEBUG;
     const char *db = "Default";
     set_databaseNames(1, &db);
 }
@@ -61,7 +70,7 @@ void Yaz_IR_Assoc::get_databaseNames (int *num, char ***list)
 void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
 {
     int i;
-    logf (LOG_LOG, "Yaz_IR_Assoc::set_databaseNames num=%d", num);
+    logf (m_log, "Yaz_IR_Assoc::set_databaseNames num=%d", num);
     for (i = 0; i<m_num_databaseNames; i++)
        delete [] m_databaseNames[i];
     delete [] m_databaseNames;
@@ -165,32 +174,32 @@ void Yaz_IR_Assoc::get_elementSetName (const char **elementSetName)
 
 void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu)
 {
-    logf (LOG_LOG, "recv_Z_PDU");
+    logf (m_log, "recv_Z_PDU");
     m_lastReceived = apdu->which;
     switch (apdu->which)
     {
     case Z_APDU_initResponse:
-       logf (LOG_LOG, "recv InitResponse");
+       logf (m_log, "recv InitResponse");
        recv_initResponse(apdu->u.initResponse);
        break;
     case Z_APDU_initRequest:
-        logf (LOG_LOG, "recv InitRequest");
+        logf (m_log, "recv InitRequest");
        recv_initRequest(apdu->u.initRequest);
         break;
     case Z_APDU_searchRequest:
-        logf (LOG_LOG, "recv searchRequest");
+        logf (m_log, "recv searchRequest");
        recv_searchRequest(apdu->u.searchRequest);
         break;
     case Z_APDU_searchResponse:
-       logf (LOG_LOG, "recv searchResponse"); 
+       logf (m_log, "recv searchResponse"); 
        recv_searchResponse(apdu->u.searchResponse);
        break;
     case Z_APDU_presentRequest:
-        logf (LOG_LOG, "recv presentRequest");
+        logf (m_log, "recv presentRequest");
        recv_presentRequest(apdu->u.presentRequest);
         break;
     case Z_APDU_presentResponse:
-        logf (LOG_LOG, "recv presentResponse");
+        logf (m_log, "recv presentResponse");
        recv_presentResponse(apdu->u.presentResponse);
         break;
     }
@@ -217,7 +226,7 @@ int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query)
        oid_ent_to_oid(&prefsyn, oid_syntax);
        req->preferredRecordSyntax = oid_syntax;
     }
-    logf (LOG_LOG, "send_searchRequest");
+    logf (m_log, "send_searchRequest");
     assert (req->otherInfo == 0);
     if (m_cookie)
     {
@@ -293,17 +302,10 @@ void Yaz_IR_Assoc::client(const char *addr)
     delete [] m_host;
     m_host = new char[strlen(addr)+1];
     strcpy(m_host, addr);
-    const char *zurl_p = (m_proxy ? m_proxy : m_host);
-    char *zurl = new char[strlen(zurl_p)+1];
-    strcpy(zurl, zurl_p);
-    char *dbpart = strchr(zurl, '/');
+    const char *dbpart = strchr(m_host, '/');
     if (dbpart)
-    {
        set_databaseNames (dbpart+1, "+ ");
-       *dbpart = '\0';
-    }
-    Yaz_Z_Assoc::client(zurl);
-    delete [] zurl;
+    Yaz_Z_Assoc::client(m_proxy ? m_proxy : m_host);
 }
 
 const char *Yaz_IR_Assoc::get_proxy()
@@ -375,18 +377,7 @@ int Yaz_IR_Assoc::send_initRequest()
     ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
 
     if (m_proxy && m_host)
-    {
-       char *rawhost = new char[strlen(m_host)+1];
-       strcpy(rawhost, m_host);
-       char *dbpart = strchr(rawhost, '/');
-       if (dbpart)
-       {
-           set_databaseNames (dbpart+1, "+ ");
-           *dbpart = '\0';
-       }
-       set_otherInformationString(&req->otherInfo, VAL_PROXY, 1, rawhost);
-       delete [] rawhost;
-    }
+       set_otherInformationString(&req->otherInfo, VAL_PROXY, 1, m_host);
     if (m_cookie)
        set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
     return send_Z_PDU(apdu);