X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-ir-assoc.cpp;h=e6c854f68723e7a3c1ff9abc6b9839b5ea80344f;hb=50f38dcd58cdf62b3380710bdd7f23d6f88c555c;hp=a88888d75aef3700b8ad5b66cf243dd07be548be;hpb=5c45ffbb2b430a6f41277c303a5e9b94242dab96;p=yazpp-moved-to-github.git diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp index a88888d..e6c854f 100644 --- a/src/yaz-ir-assoc.cpp +++ b/src/yaz-ir-assoc.cpp @@ -1,10 +1,36 @@ /* - * 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.7 1999-04-21 12:09:01 adam + * 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. * @@ -18,8 +44,8 @@ #include -#include -#include +#include +#include Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable) : Yaz_Z_Assoc(the_PDU_Observable) @@ -32,6 +58,7 @@ Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable) m_host = 0; m_proxy = 0; m_cookie = 0; + m_log = LOG_DEBUG; const char *db = "Default"; set_databaseNames(1, &db); } @@ -52,15 +79,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 (LOG_LOG, "Yaz_IR_Assoc::set_databaseNames num=%d", num); + logf (m_log, "Yaz_IR_Assoc::set_databaseNames num=%d", num); for (i = 0; iwhich; switch (apdu->which) { case Z_APDU_initResponse: - logf (LOG_LOG, "recv InitResponse"); + logf (m_log, "recv InitResponse"); recv_initResponse(apdu->u.initResponse); break; case Z_APDU_initRequest: - logf (LOG_LOG, "recv InitRequest"); + logf (m_log, "recv InitRequest"); recv_initRequest(apdu->u.initRequest); break; case Z_APDU_searchRequest: - logf (LOG_LOG, "recv searchRequest"); + logf (m_log, "recv searchRequest"); recv_searchRequest(apdu->u.searchRequest); break; case Z_APDU_searchResponse: - logf (LOG_LOG, "recv searchResponse"); + logf (m_log, "recv searchResponse"); recv_searchResponse(apdu->u.searchResponse); break; case Z_APDU_presentRequest: - logf (LOG_LOG, "recv presentRequest"); + logf (m_log, "recv presentRequest"); recv_presentRequest(apdu->u.presentRequest); break; case Z_APDU_presentResponse: - logf (LOG_LOG, "recv presentResponse"); + logf (m_log, "recv presentResponse"); recv_presentResponse(apdu->u.presentResponse); break; } } -int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query) +int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query, + char* pResultSetId, + char* pRefId) { Z_APDU *apdu = create_Z_PDU(Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; @@ -211,17 +242,31 @@ int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query) oid_ent_to_oid(&prefsyn, oid_syntax); req->preferredRecordSyntax = oid_syntax; } - logf (LOG_LOG, "send_searchRequest"); + logf (m_log, "send_searchRequest"); assert (req->otherInfo == 0); if (m_cookie) { set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie); assert (req->otherInfo); } + + if ( pRefId ) + { + req->referenceId = getRefID(pRefId); + } + + if ( pResultSetId ) + { + req->resultSetName = pResultSetId; + } + return send_Z_PDU(apdu); } -int Yaz_IR_Assoc::send_presentRequest(int start, int number) +int Yaz_IR_Assoc::send_presentRequest(int start, + int number, + char* pResultSetId, + char* pRefId) { Z_APDU *apdu = create_Z_PDU(Z_APDU_presentRequest); Z_PresentRequest *req = apdu->u.presentRequest; @@ -250,8 +295,20 @@ int Yaz_IR_Assoc::send_presentRequest(int start, int number) compo.which = Z_RecordComp_simple; compo.u.simple = elementSetNames; } + if (m_cookie) set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie); + + if ( pRefId ) + { + req->referenceId = getRefID(pRefId); + } + + if ( pResultSetId ) + { + req->resultSetId = pResultSetId; + } + return send_Z_PDU(apdu); } @@ -287,17 +344,10 @@ void Yaz_IR_Assoc::client(const char *addr) delete [] m_host; m_host = new char[strlen(addr)+1]; strcpy(m_host, addr); - const char *zurl_p = (m_proxy ? m_proxy : m_host); - char *zurl = new char[strlen(zurl_p)+1]; - strcpy(zurl, zurl_p); - char *dbpart = strchr(zurl, '/'); + const char *dbpart = strchr(m_host, '/'); if (dbpart) - { set_databaseNames (dbpart+1, "+ "); - *dbpart = '\0'; - } - Yaz_Z_Assoc::client(zurl); - delete [] zurl; + Yaz_Z_Assoc::client(m_proxy ? m_proxy : m_host); } const char *Yaz_IR_Assoc::get_proxy() @@ -350,7 +400,7 @@ void Yaz_IR_Assoc::set_lastReceived(int lastReceived) m_lastReceived = lastReceived; } -int Yaz_IR_Assoc::send_initRequest() +int Yaz_IR_Assoc::send_initRequest(char* pRefId) { Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest); Z_InitRequest *req = apdu->u.initRequest; @@ -368,6 +418,11 @@ int Yaz_IR_Assoc::send_initRequest() ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); + if ( pRefId ) + { + req->referenceId = getRefID(pRefId); + } + if (m_proxy && m_host) set_otherInformationString(&req->otherInfo, VAL_PROXY, 1, m_host); if (m_cookie) @@ -375,3 +430,37 @@ int Yaz_IR_Assoc::send_initRequest() return send_Z_PDU(apdu); } +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; + req->num_resultSetList = 1; + ResultSetIds[0] = pResultSetId; + req->resultSetList = ResultSetIds; + } + else + { + *req->deleteFunction = Z_DeleteResultSetRequest_all; + } + + if ( pRefId ) + { + req->referenceId = getRefID(pRefId); + } + + if (m_proxy && m_host) + 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); +} + +