zlint part of Debian package

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

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 872cee6..86da0d8 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.98 2004-02-10 15:02:19 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.102 2004-02-16 10:47:37 adam Exp $
  */
 
 #include <assert.h>
@@ -638,7 +638,7 @@ void Yaz_Proxy::convert_xsl_delay()
            xsltFreeStylesheet(m_stylesheet_xsp);
        m_stylesheet_xsp = 0;
        timeout(m_client_idletime);
-       int r = send_PDU_convert(m_stylesheet_apdu);
+       send_PDU_convert(m_stylesheet_apdu);
     }
     else
        timeout(0);
@@ -896,6 +896,7 @@ int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
            er->record.recordData_buf = b;
            er->record.recordData_len = len;
            er->record.recordPacking = m_s2z_packing;
+           er->record.recordSchema = "http://explain.z3950.org/dtd/2.0/";
 
            er->diagnostics = diagnostics;
            er->num_diagnostics = num_diagnostics;
@@ -1982,6 +1983,8 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
                ODR_MASK_SET(apdu->u.initRequest->options, i);
            ODR_MASK_CLEAR(apdu->u.initRequest->options,
                           Z_Options_negotiationModel);
+           ODR_MASK_CLEAR(apdu->u.initRequest->options,
+                          Z_Options_concurrentOperations);
 
            // make new version
            m_initRequest_version = apdu->u.initRequest->protocolVersion;
@@ -1997,19 +2000,22 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
        {
            if (handle_init_response_for_invalid_session(apdu))
                return;
-           Z_APDU *apdu2 = m_client->m_initResponse;
-           apdu2->u.initResponse->otherInfo = 0;
-           if (m_client->m_cookie && *m_client->m_cookie)
-               set_otherInformationString(apdu2, VAL_COOKIE, 1,
-                                          m_client->m_cookie);
-           apdu2->u.initResponse->referenceId =
-               apdu->u.initRequest->referenceId;
-           apdu2->u.initResponse->options = m_client->m_initResponse_options;
-           apdu2->u.initResponse->protocolVersion = 
-               m_client->m_initResponse_version;
-
-           send_to_client(apdu2);
-           return;
+           if (m_client->m_initResponse)
+           {
+               Z_APDU *apdu2 = m_client->m_initResponse;
+               apdu2->u.initResponse->otherInfo = 0;
+               if (m_client->m_cookie && *m_client->m_cookie)
+                   set_otherInformationString(apdu2, VAL_COOKIE, 1,
+                                              m_client->m_cookie);
+               apdu2->u.initResponse->referenceId =
+                   apdu->u.initRequest->referenceId;
+               apdu2->u.initResponse->options = m_client->m_initResponse_options;
+               apdu2->u.initResponse->protocolVersion = 
+                   m_client->m_initResponse_version;
+               
+               send_to_client(apdu2);
+               return;
+           }
        }
        m_client->m_init_flag = 1;
     }
@@ -2178,6 +2184,8 @@ void Yaz_ProxyClient::pre_init_client()
        ODR_MASK_SET(req->options, i);
     ODR_MASK_CLEAR(apdu->u.initRequest->options,
                   Z_Options_negotiationModel);
+    ODR_MASK_CLEAR(apdu->u.initRequest->options,
+                  Z_Options_concurrentOperations);
     for (i = 0; i<= 10; i++)
        ODR_MASK_SET(req->protocolVersion, i);