X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=include%2Fyazproxy%2Fproxy.h;h=f15171ea7db20388ef8795c5a1537f4fabc5bf23;hb=6699ea1b1b538de074500e2c740152135dfa75c5;hp=95dc385ef903440da9993c8de74789c774a7db62;hpb=e9a5a9feeb12335c668b73dbb6385908be6806f1;p=yazproxy-moved-to-github.git

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index 95dc385..f15171e 100644
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,4 +1,4 @@
-/* $Id: proxy.h,v 1.13 2005-02-21 14:27:32 adam Exp $
+/* $Id: proxy.h,v 1.15 2005-05-04 08:31:44 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -41,6 +41,12 @@ class Yaz_Proxy;
 class Yaz_usemarcon;
 class Yaz_ProxyConfig;
 class Yaz_ProxyClient;
+class Yaz_CharsetConverter;
+
+enum YAZ_Proxy_MARCXML_mode {
+    none,
+    marcxml,
+};
 
 /// Information Retrieval Proxy Server.
 class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
@@ -93,6 +99,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
 
     Z_APDU *handle_query_validation(Z_APDU *apdu);
     Z_APDU *handle_query_transformation(Z_APDU *apdu);
+    Z_APDU *handle_query_charset_conversion(Z_APDU *apdu);
 
     Z_APDU *handle_syntax_validation(Z_APDU *apdu);
 
@@ -103,7 +110,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     Yaz_ProxyConfig *check_reconfigure();
     int m_request_no;
     int m_invalid_session;
-    int m_marcxml_flag;
+    YAZ_Proxy_MARCXML_mode m_marcxml_mode;
     void *m_stylesheet_xsp;  // Really libxslt's xsltStylesheetPtr 
     int m_stylesheet_offset;
     Z_APDU *m_stylesheet_apdu;
@@ -164,6 +171,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     char *m_usemarcon_ini_stage1;
     char *m_usemarcon_ini_stage2;
     Yaz_usemarcon *m_usemarcon;
+    Yaz_CharsetConverter *m_charset_converter;
  public:
     Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
 	      Yaz_Proxy *parent = 0);
@@ -181,6 +189,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     const char *option(const char *name, const char *value);
     void set_default_target(const char *target);
     void set_proxy_negotiation (const char *charset, const char *lang);
+    void set_query_charset(const char *charset);
     char *get_proxy_target() { return m_proxyTarget; };
     char *get_session_str() { return m_session_str; };
     void set_max_clients(int m) { m_max_clients = m; };