X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2B%2B%2Fproxy.h;h=a2d8819f6450f85ab0557507ef5af5e0aea2acb1;hb=efb41657fc33883e6520fa571c5a944106271ec5;hp=cb96fc1364b8e05b10ba4fd7b20c4385d4d92de7;hpb=a5b1e5653ae9b27e85c6fad5bec42b6fc5156fcb;p=yazpp-moved-to-github.git diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h index cb96fc1..a2d8819 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.18 2003-10-16 13:40:41 adam Exp $ + * $Id: proxy.h,v 1.32 2004-01-08 22:54:52 adam Exp $ */ +#include #include #include #include - -#if HAVE_XML2 +#include +#if HAVE_XSLT #include #include #endif @@ -18,8 +19,10 @@ class Yaz_Proxy; #define MAX_ZURL_PLEX 10 -#define PROXY_LOG_APDU 1 -#define PROXY_LOG_REQ 1 +#define PROXY_LOG_APDU_CLIENT 1 +#define PROXY_LOG_APDU_SERVER 2 +#define PROXY_LOG_REQ_CLIENT 4 +#define PROXY_LOG_REQ_SERVER 8 struct Yaz_RecordCache_Entry; @@ -41,33 +44,43 @@ public: int *keepalive_limit_bw, int *keepalive_limit_pdu, int *pre_init, - int *log_mask); + const char **cql2rpn); + + void get_generic_info(int *log_mask, int *max_clients); void get_target_info(const char *name, const char **url, int *limit_bw, int *limit_pdu, int *limit_req, int *target_idletime, int *client_idletime, int *max_clients, int *keepalive_limit_bw, int *keepalive_limit_pdu, - int *pre_init, int *log_mask); + int *pre_init, + 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); -#if HAVE_XML2 + int mycmp(const char *hay, const char *item, size_t len); +#if HAVE_XSLT + int check_schema(xmlNodePtr ptr, Z_RecordComposition *comp, + 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, int *log_mask); + 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, @@ -124,7 +137,9 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc { Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable, Yaz_Proxy *parent); ~Yaz_ProxyClient(); + void recv_GDU(Z_GDU *apdu, int len); void recv_Z_PDU(Z_APDU *apdu, int len); + void recv_HTTP_response(Z_HTTP_Response *apdu, int len); IYaz_PDU_Observer* sessionNotify (IYaz_PDU_Observable *the_PDU_Observable, int fd); void shutdown(); @@ -158,12 +173,25 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc { Yaz_Proxy *m_root; }; +class YAZ_EXPORT Yaz_cql2rpn { + public: + Yaz_cql2rpn(); + ~Yaz_cql2rpn(); + void set_pqf_file(const char *fname); + int query_transform(const char *cql, Z_RPNQuery **rpnquery, ODR o, + char **addinfop); + private: + cql_transform_t m_transform; +}; + + /// Information Retrieval Proxy Server. class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { private: char *get_cookie(Z_OtherInformation **otherInfo); char *get_proxy(Z_OtherInformation **otherInfo); - Yaz_ProxyClient *get_client(Z_APDU *apdu); + Yaz_ProxyClient *get_client(Z_APDU *apdu, const char *cookie, + const char *proxy_host); Z_APDU *result_set_optimize(Z_APDU *apdu); void shutdown(); @@ -173,6 +201,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { Yaz_Proxy *m_parent; int m_seqno; int m_max_clients; + int m_log_mask; int m_keepalive_limit_bw; int m_keepalive_limit_pdu; int m_client_idletime; @@ -192,7 +221,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { Yaz_bw m_bw_stat; int m_pdu_max; Yaz_bw m_pdu_stat; - Z_APDU *m_bw_hold_PDU; + Z_GDU *m_bw_hold_PDU; int m_max_record_retrieve; void handle_max_record_retrieve(Z_APDU *apdu); void display_diagrecs(Z_DiagRec **pp, int num); @@ -200,6 +229,8 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { const char *addinfo); Z_APDU *handle_query_validation(Z_APDU *apdu); + Z_APDU *handle_query_transformation(Z_APDU *apdu); + Z_APDU *handle_syntax_validation(Z_APDU *apdu); const char *load_balance(const char **url); int m_reconfig_flag; @@ -207,13 +238,46 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { int m_request_no; int m_invalid_session; int m_marcxml_flag; + 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; + NMEM m_initRequest_mem; + Z_APDU *m_apdu_invalid_session; + NMEM m_mem_invalid_session; + int send_PDU_convert(Z_APDU *apdu, int *len); + ODR m_s2z_odr_init; + ODR m_s2z_odr_search; + int m_s2z_hit_count; + int m_s2z_packing; + 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, 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 z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, + Z_DefaultDiagFormat *ddf); + int m_http_keepalive; + const char *m_http_version; + Yaz_cql2rpn m_cql2rpn; + 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 recv_Z_PDU(Z_APDU *apdu, int len); - void recv_Z_PDU_0(Z_APDU *apdu); + 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); IYaz_PDU_Observer* sessionNotify (IYaz_PDU_Observable *the_PDU_Observable, int fd); void failNotify(); @@ -231,7 +295,9 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { int set_config(const char *name); void reconfig() { m_reconfig_flag = 1; } int send_to_client(Z_APDU *apdu); - void server(const char *addr); + int server(const char *addr); void pre_init(); + int get_log_mask() { return m_log_mask; }; + int handle_init_response_for_invalid_session(Z_APDU *apdu); };