X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fproxyp.h;h=f791372b5112d7914a4f74f778caf2c628f750a3;hp=f87ec927ab188b8099f4acd6d319fc8c06fe1088;hb=84a66ec6eb9b25953cbdcf61c97ecc57c45066c4;hpb=88510217a59150b1c3812213099ddef2a3d2846e

diff --git a/src/proxyp.h b/src/proxyp.h
index f87ec92..f791372 100644
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,7 +1,5 @@
-/* $Id: proxyp.h,v 1.19 2006-07-06 11:50:26 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #if YAZ_HAVE_XSLT
 #include <libxml/parser.h>
@@ -28,7 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #if HAVE_USEMARCON
-#include <objectlist.h>
+#include <usemarconlib.h>
+#include <defines.h>
 #endif
 
 #include <yazpp/record-cache.h>
@@ -46,8 +44,8 @@ class Yaz_usemarcon {
                 const char *input, int input_len,
                 char **output, int *output_len);
 #if HAVE_USEMARCON
-    CDetails *m_stage1;
-    CDetails *m_stage2;
+    Usemarcon *m_stage1;
+    Usemarcon *m_stage2;
 #else
     int dummy;
 #endif
@@ -62,6 +60,7 @@ public:
     const char *get_client_query_charset(void);
     const char *get_target_query_charset(void);
     void convert_type_1(Z_RPNQuery *q, ODR o);
+    void convert_term(Z_Term *q, ODR o);
     void set_client_charset_selected(int sel);
     int get_client_charset_selected();
 private:
@@ -93,6 +92,7 @@ public:
                       int *limit_search,
                       int *target_idletime,
                       int *client_idletime,
+                      int *max_sockets,
                       int *max_clients,
                       int *keepalive_limit_bw,
                       int *keepalive_limit_pdu,
@@ -115,6 +115,7 @@ public:
                          int *limit_bw, int *limit_pdu, int *limit_req,
                          int *limit_search,
                          int *target_idletime, int *client_idletime,
+                         int *max_sockets,
                          int *max_clients,
                          int *keepalive_limit_bw, int *keepalive_limit_pdu,
                          int *pre_init,
@@ -130,7 +131,8 @@ public:
                      Odr_oid *syntax, Z_RecordComposition *comp,
                      char **addinfo, char **stylesheet, char **schema,
                      char **backend_type, char **backend_charset,
-                     char **usemarcon_ini_stage1, char **usemarcon_ini_stage2);
+                     char **usemarcon_ini_stage1, char **usemarcon_ini_stage2,
+                     char **backend_elementset);
 
     void target_authentication(const char *name,
                                ODR odr,
@@ -144,7 +146,7 @@ public:
                                      const char *password,
                                      const char *peer_IP);
     char *get_explain_doc(ODR odr, const char *name, const char *db,
-                          int *len);
+                          int *len, int *http_status);
     const char *get_explain_name(const char *db, const char **backend_db);
  private:
     void operator=(const Yaz_ProxyConfig &conf);
@@ -176,7 +178,7 @@ class Yaz_ProxyClient : public yazpp_1::Z_Assoc {
     yazpp_1::Yaz_Z_Databases m_last_databases;
     char *m_last_resultSetId;
     int m_last_ok;
-    int m_last_resultCount;
+    Odr_int m_last_resultCount;
     int m_sr_transform;
     int m_seqno;
     int m_waiting;
@@ -205,6 +207,7 @@ class Yaz_ProxyClient : public yazpp_1::Z_Assoc {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab