/*
- * 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.5 1999-04-09 11:46:57 adam
- * Added object Yaz_Z_Assoc. Much more functional 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.
+ * 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.
*/
#include <assert.h>
-#include <log.h>
-#include <yaz-ir-assoc.h>
+#include <yaz/log.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)
m_lastReceived = 0;
m_host = 0;
m_proxy = 0;
-
+ m_cookie = 0;
+ m_log = LOG_DEBUG;
const char *db = "Default";
set_databaseNames(1, &db);
}
{
if (m_elementSetNames)
delete [] m_elementSetNames->u.generic;
- delete m_elementSetNames;
+ delete [] m_elementSetNames;
+ delete [] m_host;
+ delete [] m_proxy;
+ delete [] m_cookie;
}
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; 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::set_otherInformationString (
- Z_OtherInformation **otherInformation,
- int *oid, int categoryValue,
- const char *str)
-{
- Z_OtherInformationUnit *oi =
- set_otherInformation(otherInformation, oid, categoryValue);
- if (!oi)
- return;
- oi->information.characterInfo = odr_strdup (odr_encode(), str);
-}
-
-Z_OtherInformationUnit *Yaz_IR_Assoc::set_otherInformation (
- Z_OtherInformation **otherInformationP,
- int *oid, int categoryValue)
-{
- int i;
- Z_OtherInformation *otherInformation = *otherInformationP;
- if (!otherInformation)
- {
- otherInformation = *otherInformationP = (Z_OtherInformation *)
- odr_malloc (odr_encode(), sizeof(*otherInformation));
- otherInformation->num_elements = 0;
- otherInformation->list = (Z_OtherInformationUnit **)
- odr_malloc (odr_encode(), 8*sizeof(*otherInformation));
- for (i = 0; i<8; i++)
- otherInformation->list[i] = 0;
- }
- for (i = 0; i<otherInformation->num_elements; i++)
- {
- assert (otherInformation->list[i]);
- if (!oid)
- {
- if (!otherInformation->list[i]->category)
- return otherInformation->list[i];
- }
- else
- {
- if (otherInformation->list[i]->category &&
- categoryValue ==
- *otherInformation->list[i]->category->categoryValue &&
- !oid_oidcmp (oid, otherInformation->list[i]->category->
- categoryTypeId))
- return otherInformation->list[i];
- }
- }
- otherInformation->list[i] = (Z_OtherInformationUnit*)
- odr_malloc (odr_encode(), sizeof(Z_OtherInformationUnit));
- if (oid)
- {
- otherInformation->list[i]->category = (Z_InfoCategory*)
- odr_malloc (odr_encode(), sizeof(Z_InfoCategory));
- otherInformation->list[i]->category->categoryTypeId = (int*)
- odr_oiddup (odr_encode(), oid);
- otherInformation->list[i]->category->categoryValue = (int*)
- odr_malloc (odr_encode(), sizeof(int));
- *otherInformation->list[i]->category->categoryValue =
- categoryValue;
- }
- else
- otherInformation->list[i]->category = 0;
- otherInformation->list[i]->which = Z_OtherInfo_characterInfo;
- otherInformation->list[i]->information.characterInfo = 0;
-
- otherInformation->num_elements = i+1;
- return otherInformation->list[i];
-}
-
void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu)
{
- logf (LOG_LOG, "recv_Z_PDU");
+ logf (m_log, "recv_Z_PDU");
m_lastReceived = apdu->which;
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;
if (!req->query)
return -1;
get_databaseNames (&req->num_databaseNames, &req->databaseNames);
- for (int i = 0; i<req->num_databaseNames; i++)
- logf (LOG_LOG, "Database %s", req->databaseNames[i]);
int oid_syntax[OID_SIZE];
oident prefsyn;
get_preferredRecordSyntax(&recordSyntax);
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;
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);
}
void Yaz_IR_Assoc::set_proxy(const char *str)
{
- delete m_proxy;
- m_proxy = new char[strlen(str)+1];
- strcpy (m_proxy, str);
+ delete [] m_proxy;
+ m_proxy = 0;
+ if (str)
+ {
+ m_proxy = new char[strlen(str)+1];
+ strcpy (m_proxy, str);
+ }
+}
+
+void Yaz_IR_Assoc::set_cookie(const char *str)
+{
+ delete [] m_cookie;
+ m_cookie = 0;
+ if (str)
+ {
+ m_cookie = new char[strlen(str)+1];
+ strcpy(m_cookie, str);
+ }
+}
+
+const char *Yaz_IR_Assoc::get_cookie()
+{
+ return m_cookie;
}
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()
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;
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)
+ set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
+ 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 )
{
- int oid[OID_SIZE];
- struct oident ent;
- ent.proto = PROTO_Z3950;
- ent.oclass = CLASS_USERINFO;
- ent.value = VAL_PROXY;
- oid_ent_to_oid (&ent, oid);
- logf (LOG_LOG, "proxy host %s", m_host);
- set_otherInformationString(&req->otherInfo, oid, 1, m_host);
+ *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);
}
+
projects / yazpp-moved-to-github.git / blobdiff