/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2003, 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
- * 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.19 2003-10-01 13:13:51 adam Exp $
*/
#include <assert.h>
#include <yaz/log.h>
-#include <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)
*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];
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;
*elementSetName = m_elementSetNames->u.generic;
}
-void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu)
+void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu, int len)
{
- logf (m_log, "recv_Z_PDU");
+ yaz_log (m_log, "recv_Z_PDU %d bytes", len);
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;
}
}
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)
{
req->resultSetName = pResultSetId;
}
- return send_Z_PDU(apdu);
+ return send_Z_PDU(apdu, 0);
}
int Yaz_IR_Assoc::send_presentRequest(int start,
req->resultSetId = pResultSetId;
}
- return send_Z_PDU(apdu);
+ return send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::set_proxy(const char *str)
void Yaz_IR_Assoc::recv_searchRequest(Z_SearchRequest *searchRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_searchResponse);
- send_Z_PDU(apdu);
+ send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::recv_presentRequest(Z_PresentRequest *presentRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_presentResponse);
- send_Z_PDU(apdu);
+ send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::recv_initRequest(Z_InitRequest *initRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse);
- send_Z_PDU(apdu);
+ send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::recv_searchResponse (Z_SearchResponse *searchResponse)
{
}
+void Yaz_IR_Assoc::recv_extendedServicesResponse(Z_ExtendedServicesResponse *ExtendedServicesResponse)
+{
+}
+
int Yaz_IR_Assoc::get_lastReceived()
{
return m_lastReceived;
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);
+ return send_Z_PDU(apdu, 0);
}
-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;
if (m_cookie)
set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
-
- return send_Z_PDU(apdu);
+ return send_Z_PDU(apdu, 0);
}
projects / yazpp-moved-to-github.git / blobdiff