/*
- * 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.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.
#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)
*list = m_databaseNames;
}
+typedef char *charp;
void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
{
int 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];
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;
switch (apdu->which)
{
case Z_APDU_initResponse:
- logf (m_log, "recv InitResponse");
- recv_initResponse(apdu->u.initResponse);
- break;
+ logf (m_log, "recv InitResponse");
+ recv_initResponse(apdu->u.initResponse);
+ break;
case Z_APDU_initRequest:
logf (m_log, "recv InitRequest");
- recv_initRequest(apdu->u.initRequest);
+ recv_initRequest(apdu->u.initRequest);
break;
case Z_APDU_searchRequest:
logf (m_log, "recv searchRequest");
- recv_searchRequest(apdu->u.searchRequest);
+ recv_searchRequest(apdu->u.searchRequest);
break;
case Z_APDU_searchResponse:
- logf (m_log, "recv searchResponse");
- recv_searchResponse(apdu->u.searchResponse);
- break;
+ logf (m_log, "recv searchResponse");
+ recv_searchResponse(apdu->u.searchResponse);
+ break;
case Z_APDU_presentRequest:
logf (m_log, "recv presentRequest");
- recv_presentRequest(apdu->u.presentRequest);
+ recv_presentRequest(apdu->u.presentRequest);
break;
case Z_APDU_presentResponse:
logf (m_log, "recv presentResponse");
- recv_presentResponse(apdu->u.presentResponse);
+ recv_presentResponse(apdu->u.presentResponse);
+ break;
+ case Z_APDU_extendedServicesResponse:
+ logf (m_log, "recv extendedServiceResponse");
+ recv_extendedServicesResponse(apdu->u.extendedServicesResponse);
break;
}
}
{
}
+void Yaz_IR_Assoc::recv_extendedServicesResponse(Z_ExtendedServicesResponse *ExtendedServicesResponse)
+{
+}
+
int Yaz_IR_Assoc::get_lastReceived()
{
return m_lastReceived;
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;