/*
- * 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.2 1999-01-28 13:08:43 adam
- * Yaz_PDU_Assoc better encapsulated. Memory leak fix in
- * yaz-socket-manager.cc.
+ * 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.1.1.1 1999/01/28 09:41:07 adam
- * First implementation of YAZ++.
+ * 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 <log.h>
-#include <yaz-ir-assoc.h>
+#include <assert.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_PDU_Observable = the_PDU_Observable;
- m_odr_in = odr_createmem (ODR_DECODE);
- m_odr_out = odr_createmem (ODR_ENCODE);
- m_odr_print = odr_createmem (ODR_PRINT);
+ m_num_databaseNames = 0;
+ m_databaseNames = 0;
+ m_preferredRecordSyntax = VAL_NONE;
+ m_elementSetNames = 0;
+ m_lastReceived = 0;
+ m_host = 0;
+ m_proxy = 0;
+ m_cookie = 0;
+ m_log = LOG_DEBUG;
+ const char *db = "Default";
+ set_databaseNames(1, &db);
}
Yaz_IR_Assoc::~Yaz_IR_Assoc()
{
- m_PDU_Observable->destroy();
- delete m_PDU_Observable;
- odr_destroy (m_odr_print);
- odr_destroy (m_odr_out);
- odr_destroy (m_odr_in);
+ if (m_elementSetNames)
+ delete [] m_elementSetNames->u.generic;
+ delete [] m_elementSetNames;
+ delete [] m_host;
+ delete [] m_proxy;
+ delete [] m_cookie;
}
-void Yaz_IR_Assoc::recv_PDU(const char *buf, int len)
+void Yaz_IR_Assoc::get_databaseNames (int *num, char ***list)
{
- logf (LOG_LOG, "recv_PDU len=%d", len);
- Z_APDU *apdu = decode_Z_PDU (buf, len);
- if (apdu)
- recv_Z_PDU (apdu);
+ *num = m_num_databaseNames;
+ *list = m_databaseNames;
}
-Z_APDU *Yaz_IR_Assoc::create_Z_PDU(int type)
+typedef char *charp;
+void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
{
- return zget_APDU(m_odr_out, type);
+ int i;
+ 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];
+ for (i = 0; i<m_num_databaseNames; i++)
+ {
+ m_databaseNames[i] = new char[strlen(list[i])+1];
+ strcpy(m_databaseNames[i], list[i]);
+ }
}
-int Yaz_IR_Assoc::send_Z_PDU(Z_APDU *apdu)
+void Yaz_IR_Assoc::set_databaseNames(const char *dblist, const char *sep)
{
- char *buf;
- int len;
- if (encode_Z_PDU(apdu, &buf, &len) > 0)
- return m_PDU_Observable->send_PDU(buf, len);
- return -1;
+ const char **list = new const char* [strlen(dblist)];
+ char *dbtmp = new char[strlen(dblist)+1];
+ strcpy(dbtmp, dblist);
+ int num = 0;
+ int len = 0;
+ for (char *cp = dbtmp; ; cp++)
+ if (*cp && !strchr(sep, *cp))
+ len++;
+ else
+ {
+ if (len)
+ {
+ list[num] = cp - len;
+ num++;
+ }
+ if (!*cp)
+ break;
+ *cp = '\0';
+ len = 0;
+ }
+ set_databaseNames (num, list);
+ delete [] dbtmp;
+ delete [] list;
}
-Z_APDU *Yaz_IR_Assoc::decode_Z_PDU(const char *buf, int len)
+void Yaz_IR_Assoc::set_preferredRecordSyntax (int value)
{
- Z_APDU *apdu;
+ m_preferredRecordSyntax = value;
+}
- odr_reset (m_odr_in);
- odr_setbuf (m_odr_in, (char*) buf, len, 0);
+void Yaz_IR_Assoc::set_preferredRecordSyntax (const char *syntax)
+{
+ m_preferredRecordSyntax = VAL_NONE;
+ if (syntax && *syntax)
+ m_preferredRecordSyntax = oid_getvalbyname (syntax);
+}
- if (!z_APDU(m_odr_in, &apdu, 0))
+void Yaz_IR_Assoc::get_preferredRecordSyntax (int *value)
+{
+ *value = m_preferredRecordSyntax;
+}
+
+void Yaz_IR_Assoc::get_preferredRecordSyntax (const char **dst)
+{
+ struct oident ent;
+ ent.proto = PROTO_Z3950;
+ ent.oclass = CLASS_RECSYN;
+ ent.value = (enum oid_value) m_preferredRecordSyntax;
+
+ int oid[OID_SIZE];
+ oid_ent_to_oid (&ent, oid);
+ struct oident *entp = oid_getentbyoid (oid);
+
+ *dst = entp ? entp->desc : "";
+}
+
+void Yaz_IR_Assoc::set_elementSetName (const char *elementSetName)
+{
+ if (m_elementSetNames)
+ delete [] m_elementSetNames->u.generic;
+ delete m_elementSetNames;
+ m_elementSetNames = 0;
+ if (elementSetName && *elementSetName)
{
- logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
- odr_errmsg(odr_geterror(m_odr_in)),
- odr_offset(m_odr_in));
- logf(LOG_LOG, "PDU dump:");
- odr_dumpBER(log_file(), buf, len);
- return 0;
+ m_elementSetNames = new Z_ElementSetNames;
+ m_elementSetNames->which = Z_ElementSetNames_generic;
+ m_elementSetNames->u.generic = new char[strlen(elementSetName)+1];
+ strcpy (m_elementSetNames->u.generic, elementSetName);
}
- else
+}
+
+void Yaz_IR_Assoc::get_elementSetName (Z_ElementSetNames **elementSetNames)
+{
+ *elementSetNames = m_elementSetNames;
+}
+
+void Yaz_IR_Assoc::get_elementSetName (const char **elementSetName)
+{
+ if (!m_elementSetNames ||
+ m_elementSetNames->which != Z_ElementSetNames_generic)
{
- logf (LOG_LOG, "decoded ok");
- return apdu;
+ *elementSetName = 0;
+ return;
}
+ *elementSetName = m_elementSetNames->u.generic;
}
-int Yaz_IR_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
+void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu)
{
- if (!z_APDU(m_odr_out, &apdu, 0))
- return -1;
- *buf = odr_getbuf (m_odr_out, len, 0);
- odr_reset (m_odr_out);
- return *len;
+ logf (m_log, "recv_Z_PDU");
+ m_lastReceived = apdu->which;
+ switch (apdu->which)
+ {
+ case Z_APDU_initResponse:
+ 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);
+ break;
+ case Z_APDU_searchRequest:
+ logf (m_log, "recv searchRequest");
+ recv_searchRequest(apdu->u.searchRequest);
+ break;
+ case Z_APDU_searchResponse:
+ 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);
+ break;
+ case Z_APDU_presentResponse:
+ logf (m_log, "recv presentResponse");
+ recv_presentResponse(apdu->u.presentResponse);
+ break;
+ }
}
-void Yaz_IR_Assoc::connectNotify()
+int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
+ char* pResultSetId,
+ char* pRefId)
{
- logf (LOG_LOG, "connectNotify");
+ Z_APDU *apdu = create_Z_PDU(Z_APDU_searchRequest);
+ Z_SearchRequest *req = apdu->u.searchRequest;
+ int recordSyntax;
+
+ req->query = query->get_Z_Query();
+ if (!req->query)
+ return -1;
+ get_databaseNames (&req->num_databaseNames, &req->databaseNames);
+ int oid_syntax[OID_SIZE];
+ oident prefsyn;
+ get_preferredRecordSyntax(&recordSyntax);
+ if (recordSyntax != VAL_NONE)
+ {
+ prefsyn.proto = PROTO_Z3950;
+ prefsyn.oclass = CLASS_RECSYN;
+ prefsyn.value = (enum oid_value) recordSyntax;
+ oid_ent_to_oid(&prefsyn, oid_syntax);
+ req->preferredRecordSyntax = oid_syntax;
+ }
+ 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);
}
-void Yaz_IR_Assoc::failNotify()
+int Yaz_IR_Assoc::send_presentRequest(int start,
+ int number,
+ char* pResultSetId,
+ char* pRefId)
{
- logf (LOG_LOG, "failNotify");
+ Z_APDU *apdu = create_Z_PDU(Z_APDU_presentRequest);
+ Z_PresentRequest *req = apdu->u.presentRequest;
+
+ req->resultSetStartPoint = &start;
+ req->numberOfRecordsRequested = &number;
+
+ int oid_syntax[OID_SIZE];
+ oident prefsyn;
+ int recordSyntax;
+ get_preferredRecordSyntax (&recordSyntax);
+ if (recordSyntax != VAL_NONE)
+ {
+ prefsyn.proto = PROTO_Z3950;
+ prefsyn.oclass = CLASS_RECSYN;
+ prefsyn.value = (enum oid_value) recordSyntax;
+ oid_ent_to_oid(&prefsyn, oid_syntax);
+ req->preferredRecordSyntax = oid_syntax;
+ }
+ Z_RecordComposition compo;
+ Z_ElementSetNames *elementSetNames;
+ get_elementSetName (&elementSetNames);
+ if (elementSetNames)
+ {
+ req->recordComposition = &compo;
+ 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 = 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)
{
- m_PDU_Observable->connect (this, addr);
+ delete [] m_host;
+ m_host = new char[strlen(addr)+1];
+ strcpy(m_host, addr);
+ const char *dbpart = strchr(m_host, '/');
+ if (dbpart)
+ set_databaseNames (dbpart+1, "+ ");
+ Yaz_Z_Assoc::client(m_proxy ? m_proxy : m_host);
+}
+
+const char *Yaz_IR_Assoc::get_proxy()
+{
+ return m_proxy;
+}
+
+const char *Yaz_IR_Assoc::get_host()
+{
+ return m_host;
+}
+
+void Yaz_IR_Assoc::recv_searchRequest(Z_SearchRequest *searchRequest)
+{
+ Z_APDU *apdu = create_Z_PDU(Z_APDU_searchResponse);
+ send_Z_PDU(apdu);
+}
+
+void Yaz_IR_Assoc::recv_presentRequest(Z_PresentRequest *presentRequest)
+{
+ Z_APDU *apdu = create_Z_PDU(Z_APDU_presentResponse);
+ send_Z_PDU(apdu);
+}
+
+void Yaz_IR_Assoc::recv_initRequest(Z_InitRequest *initRequest)
+{
+ Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse);
+ send_Z_PDU(apdu);
+}
+
+void Yaz_IR_Assoc::recv_searchResponse (Z_SearchResponse *searchResponse)
+{
+}
+
+void Yaz_IR_Assoc::recv_presentResponse (Z_PresentResponse *presentResponse)
+{
}
-void Yaz_IR_Assoc::server(const char *addr)
+void Yaz_IR_Assoc::recv_initResponse(Z_InitResponse *initResponse)
{
- m_PDU_Observable->listen (this, addr);
}
+int Yaz_IR_Assoc::get_lastReceived()
+{
+ return m_lastReceived;
+}
+
+void Yaz_IR_Assoc::set_lastReceived(int lastReceived)
+{
+ m_lastReceived = lastReceived;
+}
+
+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->options, Z_Options_search);
+ ODR_MASK_SET(req->options, Z_Options_present);
+ ODR_MASK_SET(req->options, Z_Options_namedResultSets);
+ ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl);
+ ODR_MASK_SET(req->options, Z_Options_scan);
+ ODR_MASK_SET(req->options, Z_Options_sort);
+ ODR_MASK_SET(req->options, Z_Options_extendedServices);
+ ODR_MASK_SET(req->options, Z_Options_delSet);
+
+ ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
+ 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 )
+ {
+ *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