X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2B%2B%2Fproxy.h;h=f03337706edea485f1c68b91970a042c0baceb4d;hb=ba8baf4a81c36b6a79d400c2594c4b01b8ec9b7e;hp=ccdaebd528168adb769db0bba58fcefe1ec30774;hpb=91448f60da6e5c83dab8e8acb5ae71819c1bfb3a;p=yazpp-moved-to-github.git

diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h
index ccdaebd..f033377 100644
--- a/include/yaz++/proxy.h
+++ b/include/yaz++/proxy.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: proxy.h,v 1.29 2004-01-07 13:24:12 adam Exp $
+ * $Id: proxy.h,v 1.35 2004-01-15 15:47:52 adam Exp $
  */
 
 #include <sys/time.h>
@@ -167,6 +167,8 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc {
     int m_pdu_recv;
     ODR m_init_odr;
     Z_APDU *m_initResponse;
+    Z_Options *m_initResponse_options;
+    Z_ProtocolVersion *m_initResponse_version;
     Yaz_RecordCache m_cache;
     void pre_init_client();
     int m_target_idletime;
@@ -238,11 +240,13 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     int m_request_no;
     int m_invalid_session;
     int m_marcxml_flag;
-    char *m_stylesheet;
+    char *m_stylesheet_schema;
     char *m_schema;
     void convert_to_marcxml(Z_NamePlusRecordList *p);
     void convert_xsl(Z_NamePlusRecordList *p);
     Z_APDU *m_initRequest_apdu;
+    Z_Options *m_initRequest_options;
+    Z_ProtocolVersion *m_initRequest_version;
     NMEM m_initRequest_mem;
     Z_APDU *m_apdu_invalid_session;
     NMEM m_mem_invalid_session;
@@ -254,13 +258,14 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     Z_APDU *m_s2z_init_apdu;
     Z_APDU *m_s2z_search_apdu;
     Z_APDU *m_s2z_present_apdu;
+    char *m_s2z_stylesheet;
     char *m_soap_ns;
-    int send_to_srw_client_error(int error);
+    int send_to_srw_client_error(int error, const char *add);
     int send_to_srw_client_ok(int hits, Z_Records *records, int start);
     int send_http_response(int code);
     int send_srw_response(Z_SRW_PDU *srw_pdu);
-    int send_srw_explain();
-
+    int send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
+				  int num_diagnostics);
     int z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res,
 		      Z_DefaultDiagFormat *ddf);
     int m_http_keepalive;
@@ -282,6 +287,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     void failNotify();
     void timeoutNotify();
     void connectNotify();
+    void markInvalid();
     const char *option(const char *name, const char *value);
     void set_default_target(const char *target);
     void set_proxy_authentication (const char *auth);