disable-zoom configure option

[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 42c4fbb..f8ca2d0 100644 (file)
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -2,53 +2,13 @@
  * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
  * 
- * $Log: yaz-ir-assoc.cpp,v $
- * Revision 1.15  2001-04-26 12:17:49  heikki
- * Ursula stuff, mostly in the test client
- *
- * Revision 1.14  2000/10/11 11:58:16  adam
- * Moved header files to include/yaz++. Switched to libtool and automake.
- * Configure script creates yaz++-config script.
- *
- * Revision 1.13  2000/09/06 14:23:45  adam
- * WIN32 updates.
- *
- * Revision 1.12  2000/05/10 11:36:58  ian
- * Added default parameters for refid to request functions.
- * Added default parameter for result set name to search and present request.
- * Commented out forced logging of PDU contents.
- * Added send_deleteResultSetRequest
- *
- * 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
- * Fixed setting of proxy otherInfo so that database(s) are removed.
- *
- * Revision 1.7  1999/04/21 12:09:01  adam
- * Many improvements. Modified to proxy server to work with "sessions"
- * based on cookies.
- *
- * Revision 1.6  1999/04/20 10:30:05  adam
- * Implemented various stuff for client and proxy. Updated calls
- * to ODR to reflect new name parameter.
- *
- * Revision 1.5  1999/04/09 11:46:57  adam
- * Added object Yaz_Z_Assoc. Much more functional client.
+ * $Id: yaz-ir-assoc.cpp,v 1.18 2002-10-09 12:50:26 adam Exp $
  */
 
 #include <assert.h>
 
 #include <yaz/log.h>
-#include <yaz++/yaz-ir-assoc.h>
+#include <yaz++/ir-assoc.h>
 
 Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
     : Yaz_Z_Assoc(the_PDU_Observable)
@@ -86,7 +46,7 @@ typedef char *charp;
 void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
 {
     int i;
-    logf (m_log, "Yaz_IR_Assoc::set_databaseNames num=%d", num);
+    yaz_log (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;
@@ -191,36 +151,36 @@ void Yaz_IR_Assoc::get_elementSetName (const char **elementSetName)
 
 void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu)
 {
-    logf (m_log, "recv_Z_PDU");
+    yaz_log (m_log, "recv_Z_PDU");
     m_lastReceived = apdu->which;
     switch (apdu->which)
     {
     case Z_APDU_initResponse:
-           logf (m_log, "recv InitResponse");
-           recv_initResponse(apdu->u.initResponse);
-           break;
+       yaz_log (m_log, "recv InitResponse");
+       recv_initResponse(apdu->u.initResponse);
+       break;
     case Z_APDU_initRequest:
-        logf (m_log, "recv InitRequest");
-           recv_initRequest(apdu->u.initRequest);
+        yaz_log (m_log, "recv InitRequest");
+       recv_initRequest(apdu->u.initRequest);
         break;
     case Z_APDU_searchRequest:
-        logf (m_log, "recv searchRequest");
-           recv_searchRequest(apdu->u.searchRequest);
+        yaz_log (m_log, "recv searchRequest");
+       recv_searchRequest(apdu->u.searchRequest);
         break;
     case Z_APDU_searchResponse:
-           logf (m_log, "recv searchResponse"); 
-           recv_searchResponse(apdu->u.searchResponse);
-           break;
+       yaz_log (m_log, "recv searchResponse"); 
+       recv_searchResponse(apdu->u.searchResponse);
+       break;
     case Z_APDU_presentRequest:
-        logf (m_log, "recv presentRequest");
-           recv_presentRequest(apdu->u.presentRequest);
+        yaz_log (m_log, "recv presentRequest");
+       recv_presentRequest(apdu->u.presentRequest);
         break;
     case Z_APDU_presentResponse:
-        logf (m_log, "recv presentResponse");
-           recv_presentResponse(apdu->u.presentResponse);
+        yaz_log (m_log, "recv presentResponse");
+       recv_presentResponse(apdu->u.presentResponse);
         break;
     case Z_APDU_extendedServicesResponse:
-        logf (m_log, "recv extendedServiceResponse");
+        yaz_log (m_log, "recv extendedServiceResponse");
         recv_extendedServicesResponse(apdu->u.extendedServicesResponse);
         break;
     }
@@ -249,7 +209,7 @@ int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
        oid_ent_to_oid(&prefsyn, oid_syntax);
        req->preferredRecordSyntax = oid_syntax;
     }
-    logf (m_log, "send_searchRequest");
+    yaz_log (m_log, "send_searchRequest");
     assert (req->otherInfo == 0);
     if (m_cookie)
     {