X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-ir-assoc.cpp;h=d30eab30d6052a0020cf1ebfc3f6497edc6eaefc;hb=e55896f9cb43034c3e8743b51ef79936f5404bc3;hp=1148c50af7852bb11448132aa4c1febbe29788d1;hpb=1063240efa2d4f03a72353936e8a7b73ee249b0d;p=yazpp-moved-to-github.git

diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index 1148c50..d30eab3 100644
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-ir-assoc.cpp,v $
- * Revision 1.12  2000-05-10 11:36:58  ian
+ * Revision 1.16  2001-08-13 16:39:12  adam
+ * PDU_Assoc keeps track of children. Using yaz_log instead of logf.
+ *
+ * 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.
@@ -39,7 +51,7 @@
 #include <assert.h>
 
 #include <yaz/log.h>
-#include <yaz-ir-assoc.h>
+#include <yaz++/yaz-ir-assoc.h>
 
 Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
     : Yaz_Z_Assoc(the_PDU_Observable)
@@ -73,15 +85,17 @@ void Yaz_IR_Assoc::get_databaseNames (int *num, char ***list)
     *list = m_databaseNames;
 }
 
+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;
     m_num_databaseNames = num;
-    m_databaseNames = new (char*) [num];
+
+    m_databaseNames = new char *[num];
     for (i = 0; i<m_num_databaseNames; i++)
     {
 	m_databaseNames[i] = new char[strlen(list[i])+1];
@@ -91,7 +105,7 @@ void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
 
 void Yaz_IR_Assoc::set_databaseNames(const char *dblist, const char *sep)
 {
-    const char **list = new (const char*) [strlen(dblist)];
+    const char **list = new const char* [strlen(dblist)];
     char *dbtmp = new char[strlen(dblist)+1];
     strcpy(dbtmp, dblist);
     int num = 0;
@@ -180,34 +194,38 @@ 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");
+	yaz_log (m_log, "recv InitResponse");
 	recv_initResponse(apdu->u.initResponse);
 	break;
     case Z_APDU_initRequest:
-        logf (m_log, "recv InitRequest");
+        yaz_log (m_log, "recv InitRequest");
 	recv_initRequest(apdu->u.initRequest);
         break;
     case Z_APDU_searchRequest:
-        logf (m_log, "recv searchRequest");
+        yaz_log (m_log, "recv searchRequest");
 	recv_searchRequest(apdu->u.searchRequest);
         break;
     case Z_APDU_searchResponse:
-	logf (m_log, "recv searchResponse"); 
+	yaz_log (m_log, "recv searchResponse"); 
 	recv_searchResponse(apdu->u.searchResponse);
 	break;
     case Z_APDU_presentRequest:
-        logf (m_log, "recv presentRequest");
+        yaz_log (m_log, "recv presentRequest");
 	recv_presentRequest(apdu->u.presentRequest);
         break;
     case Z_APDU_presentResponse:
-        logf (m_log, "recv presentResponse");
+        yaz_log (m_log, "recv presentResponse");
 	recv_presentResponse(apdu->u.presentResponse);
         break;
+    case Z_APDU_extendedServicesResponse:
+        yaz_log (m_log, "recv extendedServiceResponse");
+        recv_extendedServicesResponse(apdu->u.extendedServicesResponse);
+        break;
     }
 }
 
@@ -234,7 +252,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)
     {
@@ -382,6 +400,10 @@ void Yaz_IR_Assoc::recv_initResponse(Z_InitResponse *initResponse)
 {
 }
 
+void Yaz_IR_Assoc::recv_extendedServicesResponse(Z_ExtendedServicesResponse *ExtendedServicesResponse)
+{
+}
+
 int Yaz_IR_Assoc::get_lastReceived()
 {
     return m_lastReceived;
@@ -422,14 +444,13 @@ int Yaz_IR_Assoc::send_initRequest(char* pRefId)
     return send_Z_PDU(apdu);
 }
 
-int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId = NULL, char* pRefId = NULL)
+int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
 {
     char* ResultSetIds[1];
 
     Z_APDU *apdu = create_Z_PDU(Z_APDU_deleteResultSetRequest);
     Z_DeleteResultSetRequest *req = apdu->u.deleteResultSetRequest;
 
-
     if ( pResultSetId )
     {
         *req->deleteFunction = Z_DeleteResultSetRequest_list;