Use AM_LDFLAGS instead of LDFLAGS

[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 378981a..99ef2db 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,44 +1,12 @@
 /*
- * Copyright (c) 2000-2001, Index Data.
+ * Copyright (c) 2000-2003, Index Data.
  * 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.
- *
+ * $Id: yaz-z-server.cpp,v 1.17 2003-12-16 14:17:01 adam Exp $
  */
 
 #include <yaz/log.h>
-#include <yaz++/yaz-z-server.h>
+#include <yaz++/z-server.h>
 
 Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable)
     : Yaz_Z_Assoc(the_PDU_Observable)
@@ -80,7 +48,15 @@ void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility,
     (*p)->m_facility = facility;
 }
 
-void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
+void Yaz_Z_Server::recv_GDU (Z_GDU *apdu, int len)
+{
+    if (apdu->which == Z_GDU_Z3950)
+       return recv_Z_PDU(apdu->u.z3950, len);
+    else
+       delete this;
+}
+
+void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
 {   
     Yaz_Z_Server_Facility_Info *f = m_facilities;
     
@@ -108,7 +84,8 @@ void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
            f->m_facility->init(this, req, resp);
            f = f->m_next;
        }
-       send_Z_PDU(apdu_response);
+       transfer_referenceId(apdu_request, apdu_response);
+       send_Z_PDU(apdu_response, 0);
     }
     else
     {
@@ -123,7 +100,7 @@ void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
        }
        if (!taken)
        {
-           yaz_log (LOG_LOG, "unhandled request = %d", apdu_request->which);
+           yaz_log (LOG_WARN, "unhandled request = %d", apdu_request->which);
            delete this;
        }
     }
@@ -149,17 +126,11 @@ 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));
+       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;
@@ -167,8 +138,9 @@ void Yaz_Z_ServerUtility::create_surrogateDiagnostics(
     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 =
+        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+
     dr->condition = err;
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
     dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
@@ -177,10 +149,8 @@ void Yaz_Z_ServerUtility::create_surrogateDiagnostics(
 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 *)
@@ -188,17 +158,35 @@ Z_Records *Yaz_Z_ServerUtility::create_nonSurrogateDiagnostics (
     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));
+        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+
     dr->condition = err;
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
     dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
     return rec;
 }
+
+void Yaz_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 =
+        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+    dr->condition = odr_intdup (odr, error);
+    dr->which = Z_DefaultDiagFormat_v2Addinfo;
+    dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
+}