-/*
- * Copyright (c) 2000-2001, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2010 Index Data and Mike Taylor
* See the file LICENSE for details.
- *
- * $Log: yaz-z-server.cpp,v $
- * Revision 1.10 2001-04-04 14:02:49 adam
- * URSULA / Z-ruth service.
- *
- * Revision 1.9 2001/03/29 15:14:26 adam
- * Minor updates.
- *
- * Revision 1.8 2001/03/27 14:47:45 adam
- * New server facility scheme.
- *
- * Revision 1.7 2001/03/26 14:43:49 adam
- * New threaded PDU association.
- *
- * Revision 1.6 2001/01/29 11:18:24 adam
- * Server sets OPTIONS search and present.
- *
- * Revision 1.5 2000/10/24 12:29:57 adam
- * Fixed bug in proxy where a Yaz_ProxyClient could be owned by
- * two Yaz_Proxy's (fatal).
- *
- * Revision 1.4 2000/10/11 11:58:17 adam
- * Moved header files to include/yaz++. Switched to libtool and automake.
- * Configure script creates yaz++-config script.
- *
- * Revision 1.3 2000/09/21 21:43:20 adam
- * Better high-level server API.
- *
- * Revision 1.2 2000/09/12 12:09:53 adam
- * More work on high-level server.
- *
- * Revision 1.1 2000/09/08 10:23:42 adam
- * Added skeleton of yaz-z-server.
- *
*/
#include <yaz/log.h>
-#include <yaz++/yaz-z-server.h>
+#include <yazpp/z-server.h>
+#include <yaz/oid_db.h>
+
+using namespace yazpp_1;
-Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable)
- : Yaz_Z_Assoc(the_PDU_Observable)
+Z_Server::Z_Server(IPDU_Observable *the_PDU_Observable)
+ : Z_Assoc(the_PDU_Observable)
{
m_facilities = 0;
}
-Yaz_Z_Server::~Yaz_Z_Server()
+Z_Server::~Z_Server()
{
facility_reset();
}
-void Yaz_Z_Server::facility_reset ()
+void Z_Server::facility_reset ()
{
- Yaz_Z_Server_Facility_Info *p = m_facilities;
+ Z_Server_Facility_Info *p = m_facilities;
while (p)
{
- Yaz_Z_Server_Facility_Info *p_next = p->m_next;
+ Z_Server_Facility_Info *p_next = p->m_next;
- delete [] p->m_name;
- delete p;
- p = p_next;
+ delete [] p->m_name;
+ delete p;
+ p = p_next;
}
m_facilities = 0;
}
-void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility,
- const char *name)
+void Z_Server::facility_add(IServer_Facility *facility,
+ const char *name)
{
- Yaz_Z_Server_Facility_Info **p = &m_facilities;
+ Z_Server_Facility_Info **p = &m_facilities;
while (*p)
- p = &(*p)->m_next;
+ p = &(*p)->m_next;
- *p = new Yaz_Z_Server_Facility_Info;
+ *p = new Z_Server_Facility_Info;
(*p)->m_next = 0;
(*p)->m_name = new char [strlen(name)+1];
(*p)->m_facility = facility;
}
-void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
+void Z_Server::recv_GDU (Z_GDU *apdu, int len)
+{
+ if (apdu->which == Z_GDU_Z3950)
+ recv_Z_PDU(apdu->u.z3950, len);
+ else
+ delete this;
+}
+
+void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
{
- Yaz_Z_Server_Facility_Info *f = m_facilities;
+ Z_Server_Facility_Info *f = m_facilities;
if (apdu_request->which == Z_APDU_initRequest)
{
- Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse);
-
- Z_InitRequest *req = apdu_request->u.initRequest;
- Z_InitResponse *resp = apdu_response->u.initResponse;
-
- if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
- {
- ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
- }
- if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
- {
- ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2);
- }
- if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3))
- {
- ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3);
- }
- while (f)
- {
- f->m_facility->init(this, req, resp);
- f = f->m_next;
- }
- send_Z_PDU(apdu_response);
+ Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse);
+
+ Z_InitRequest *req = apdu_request->u.initRequest;
+ Z_InitResponse *resp = apdu_response->u.initResponse;
+
+ if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
+ {
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
+ }
+ if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
+ {
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2);
+ }
+ if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3))
+ {
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3);
+ }
+ while (f)
+ {
+ f->m_facility->init(this, req, resp);
+ f = f->m_next;
+ }
+ transfer_referenceId(apdu_request, apdu_response);
+ send_Z_PDU(apdu_response, 0);
}
else
{
- f = m_facilities;
- int taken = 0;
- while (f)
- {
- taken = f->m_facility->recv(this, apdu_request);
- if (taken)
- break;
- f = f->m_next;
- }
- if (!taken)
- {
- yaz_log (LOG_LOG, "unhandled request = %d", apdu_request->which);
- delete this;
- }
+ f = m_facilities;
+ int taken = 0;
+ while (f)
+ {
+ taken = f->m_facility->recv(this, apdu_request);
+ if (taken)
+ break;
+ f = f->m_next;
+ }
+ if (!taken)
+ {
+ yaz_log (YLOG_WARN, "unhandled request = %d", apdu_request->which);
+ delete this;
+ }
}
}
/*
* database record.
*/
-void Yaz_Z_ServerUtility::create_databaseRecord (
- ODR odr, Z_NamePlusRecord *rec, const char *dbname, int format,
+void Z_ServerUtility::create_databaseRecord (
+ ODR odr, Z_NamePlusRecord *rec, const char *dbname, const Odr_oid *format,
const void *buf, int len)
{
+ Odr_oid *oid = odr_oiddup(odr, format);
rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
rec->which = Z_NamePlusRecord_databaseRecord;
- rec->u.databaseRecord = z_ext_record (odr, format,
- (const char *) buf, len);
+ rec->u.databaseRecord = z_ext_record_oid(odr, oid,
+ (const char *) buf, len);
}
/*
* surrogate diagnostic.
*/
-void Yaz_Z_ServerUtility::create_surrogateDiagnostics(
+void Z_ServerUtility::create_surrogateDiagnostics(
ODR odr, Z_NamePlusRecord *rec, const char *dbname,
int error, char *const addinfo)
{
- int oid[OID_SIZE];
- int *err = (int *)odr_malloc (odr, sizeof(*err));
- oident bib1;
+ Odr_int *err = (Odr_int *)odr_malloc (odr, sizeof(*err));
Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (odr, sizeof(*drec));
Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
- odr_malloc (odr, sizeof(*dr));
+ odr_malloc (odr, sizeof(*dr));
- bib1.proto = PROTO_Z3950;
- bib1.oclass = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
- yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
+ yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
*err = error;
rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
rec->which = Z_NamePlusRecord_surrogateDiagnostic;
rec->u.surrogateDiagnostic = drec;
drec->which = Z_DiagRec_defaultFormat;
drec->u.defaultFormat = dr;
- dr->diagnosticSetId = odr_oiddup (odr,
- oid_ent_to_oid(&bib1, oid));
+ dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);
+
dr->condition = err;
dr->which = Z_DefaultDiagFormat_v2Addinfo;
dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
}
-Z_Records *Yaz_Z_ServerUtility::create_nonSurrogateDiagnostics (
+Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics (
ODR odr, int error, const char *addinfo)
{
- int oid[OID_SIZE];
Z_Records *rec = (Z_Records *)
odr_malloc (odr, sizeof(*rec));
- oident bib1;
- int *err = (int *)
+ Odr_int *err = (Odr_int *)
odr_malloc (odr, sizeof(*err));
Z_DiagRec *drec = (Z_DiagRec *)
odr_malloc (odr, sizeof(*drec));
Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
odr_malloc (odr, sizeof(*dr));
- bib1.proto = PROTO_Z3950;
- bib1.oclass = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
*err = error;
rec->which = Z_Records_NSD;
rec->u.nonSurrogateDiagnostic = dr;
- dr->diagnosticSetId =
- odr_oiddup (odr, oid_ent_to_oid(&bib1, oid));
+ dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);
+
dr->condition = err;
dr->which = Z_DefaultDiagFormat_v2Addinfo;
dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
return rec;
}
+
+void Z_ServerUtility::create_diagnostics (
+ ODR odr, int error, const char *addinfo,
+ Z_DiagRec ***dreca, int *num)
+{
+ Z_DiagRec *drec = (Z_DiagRec *) odr_malloc (odr, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+ odr_malloc (odr, sizeof(*dr));
+
+ *num = 1;
+ *dreca = (Z_DiagRec **) odr_malloc (odr, sizeof(*dreca));
+ (*dreca)[0] = drec;
+
+ drec->which = Z_DiagRec_defaultFormat;
+ drec->u.defaultFormat = dr;
+ dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);
+ dr->condition = odr_intdup (odr, error);
+ dr->which = Z_DefaultDiagFormat_v2Addinfo;
+ dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
+}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yazpp-moved-to-github.git / blobdiff