X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2B%2B%2Fproxy.h;h=0249ef7d9bd86f19cb61804853fa4e2caca5df28;hb=1cfab015d330b201317e6437fb144c9ea4cb2cd6;hp=c40f3e6f5b73bb688b413cdad043a3a9923d11ee;hpb=4c287a6c8de2a59e1b9d249c0166bfb6c37cd571;p=yazpp-moved-to-github.git

diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h
index c40f3e6..0249ef7 100644
--- a/include/yaz++/proxy.h
+++ b/include/yaz++/proxy.h
@@ -1,15 +1,16 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: proxy.h,v 1.23 2003-12-20 22:44:30 adam Exp $
+ * $Id: proxy.h,v 1.28 2004-01-07 11:10:55 adam Exp $
  */
 
+#include <sys/time.h>
 #include <yaz++/z-assoc.h>
 #include <yaz++/z-query.h>
 #include <yaz++/z-databases.h>
 #include <yaz/cql.h>
-#if HAVE_XML2
+#if HAVE_XSLT
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #endif
@@ -43,8 +44,7 @@ public:
 		      int *keepalive_limit_bw,
 		      int *keepalive_limit_pdu,
 		      int *pre_init,
-		      const char **cql2rpn,
-		      const char **zeerex);
+		      const char **cql2rpn);
     
     void get_generic_info(int *log_mask, int *max_clients);
 
@@ -54,29 +54,33 @@ public:
 			 int *max_clients,
 			 int *keepalive_limit_bw, int *keepalive_limit_pdu,
 			 int *pre_init,
-			 const char **cql2rpn,
-			 const char **zeerex);
+			 const char **cql2rpn);
 
     int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
     int check_syntax(ODR odr, const char *name,
-		     Odr_oid *syntax, char **addinfo);
+		     Odr_oid *syntax, Z_RecordComposition *comp,
+		     char **addinfo, char **stylesheet, char **schema);
+    char *get_explain(ODR odr, const char *name, const char *db,
+		      int *len);
 private:
     void operator=(const Yaz_ProxyConfig &conf);
     int mycmp(const char *hay, const char *item, size_t len);
-#if HAVE_XML2
+#if HAVE_XSLT
+    int check_schema(xmlNodePtr ptr, Z_RecordComposition *comp,
+		     const char **found_schema, const char *schema_identifier);
     xmlDocPtr m_docPtr;
     xmlNodePtr m_proxyPtr;
     void return_target_info(xmlNodePtr ptr, const char **url,
 			    int *limit_bw, int *limit_pdu, int *limit_req,
 			    int *target_idletime, int *client_idletime,
 			    int *keepalive_limit_bw, int *keepalive_limit_pdu,
-			    int *pre_init, const char **cql2rpn,
-			    const char **zeerex);
+			    int *pre_init, const char **cql2rpn);
     void return_limit(xmlNodePtr ptr,
 		      int *limit_bw, int *limit_pdu, int *limit_req);
     int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
 		     char **addinfo);
-    xmlNodePtr find_target_node(const char *name);
+    xmlNodePtr find_target_node(const char *name, const char *db);
+    xmlNodePtr find_target_db(xmlNodePtr ptr, const char *db);
     const char *get_text(xmlNodePtr ptr);
     int check_type_1_attributes(ODR odr, xmlNodePtr ptr,
 				Z_AttributeList *attrs,
@@ -174,7 +178,8 @@ class YAZ_EXPORT Yaz_cql2rpn {
     Yaz_cql2rpn();
     ~Yaz_cql2rpn();
     void set_pqf_file(const char *fname);
-    int query_transform(const char *cql, Z_RPNQuery **rpnquery, ODR o);
+    int query_transform(const char *cql, Z_RPNQuery **rpnquery, ODR o,
+			char **addinfop);
  private:
     cql_transform_t m_transform;
 };
@@ -233,7 +238,10 @@ 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_schema;
     void convert_to_marcxml(Z_NamePlusRecordList *p);
+    void convert_xsl(Z_NamePlusRecordList *p);
     Z_APDU *m_initRequest_apdu;
     NMEM m_initRequest_mem;
     Z_APDU *m_apdu_invalid_session;
@@ -258,11 +266,14 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     int m_http_keepalive;
     const char *m_http_version;
     Yaz_cql2rpn m_cql2rpn;
-    const char *m_zeerex_fname;
+    struct timeval m_time_tv;
+    void logtime();
+    Z_ElementSetNames *mk_esn_from_schema(ODR o, const char *schema);
  public:
     Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
 	      Yaz_Proxy *parent = 0);
     ~Yaz_Proxy();
+    void inc_request_no();
     void recv_GDU(Z_GDU *apdu, int len);
     void handle_incoming_HTTP(Z_HTTP_Request *req);
     void handle_incoming_Z_PDU(Z_APDU *apdu);