Moved header files to include/yaz++. Switched to libtool and automake.

[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 1148c50..e6c854f 100644 (file)
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -1,10 +1,16 @@
 /*
- * 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.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 +45,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,6 +79,7 @@ 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;
@@ -81,7 +88,8 @@ void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
        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 +99,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;
@@ -422,14 +430,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;