Added refernceId handling for other services.

[yazpp-moved-to-github.git] / src / yaz-z-server.cpp

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 993a6d6..ae7e94a 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,25 +1,211 @@
 /*
 /*

- * Copyright (c) 2000, Index Data.
+ * Copyright (c) 2000-2001, Index Data.

  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server.cpp,v $
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server.cpp,v $

- * Revision 1.1  2000-09-08 10:23:42  adam
+ * Revision 1.12  2001-04-25 19:40:18  adam
+ * Added refernceId handling for other services.
+ *
+ * Revision 1.11  2001/04/12 15:12:10  heikki
+ * minor ursula stuff
+ *
+ * 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>
  * Added skeleton of yaz-z-server.
  *
  */
 
 #include <yaz/log.h>

-#include <yaz-z-server.h>
-
+#include <yaz++/yaz-z-server.h>

 
 Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable)
     : Yaz_Z_Assoc(the_PDU_Observable)
 {
 
 Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable)
     : Yaz_Z_Assoc(the_PDU_Observable)
 {

-    m_no = 0;
+    m_facilities = 0;
+}
+
+Yaz_Z_Server::~Yaz_Z_Server()
+{
+    facility_reset();

 }
 
 }
 

-void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu)
+void Yaz_Z_Server::facility_reset ()

 {
 {

-    logf (LOG_LOG, "recv_Z_PDU in Yaz_Z_Server");
+    Yaz_Z_Server_Facility_Info *p = m_facilities;
+    while (p)
+    {
+       Yaz_Z_Server_Facility_Info *p_next = p->m_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)
+{
+    Yaz_Z_Server_Facility_Info **p = &m_facilities;
+    while (*p)
+       p = &(*p)->m_next;
+
+    *p = new Yaz_Z_Server_Facility_Info;
+
+    (*p)->m_next = 0;
+    (*p)->m_name = new char [strlen(name)+1];
+    strcpy ((*p)->m_name, name);
+    (*p)->m_facility = facility;
+}
+
+void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
+{   
+    Yaz_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;
+       }
+       transfer_referenceId(apdu_request, apdu_response);
+       send_Z_PDU(apdu_response);
+    }
+    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;
+       }
+    }
+}
+
+/*
+ * database record.
+ */
+void Yaz_Z_ServerUtility::create_databaseRecord (
+    ODR odr, Z_NamePlusRecord *rec, const char *dbname, int format,
+    const void *buf, int len)
+{
+    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);
+}
+
+/*
+ * surrogate diagnostic.
+ */
+void Yaz_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;
+    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;
+
+    yaz_log(LOG_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->condition = err;
+    dr->which = Z_DefaultDiagFormat_v2Addinfo;
+    dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
+}
+
+Z_Records *Yaz_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_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->condition = err;
+    dr->which = Z_DefaultDiagFormat_v2Addinfo;
+    dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
+    return rec;
+}