projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deliver recordSchema in response
[yazpp-moved-to-github.git]
/
include
/
yaz++
/
proxy.h
diff --git
a/include/yaz++/proxy.h
b/include/yaz++/proxy.h
index
eed6ba0
..
0249ef7
100644
(file)
--- 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.
*
* See the file LICENSE for details.
*
- * $Id: proxy.h,v 1.22 2003-12-16 14:17:01 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>
#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
#include <libxml/parser.h>
#include <libxml/tree.h>
#endif
@@
-57,11
+58,16
@@
public:
int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
int check_syntax(ODR odr, const char *name,
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);
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,
xmlDocPtr m_docPtr;
xmlNodePtr m_proxyPtr;
void return_target_info(xmlNodePtr ptr, const char **url,
@@
-73,7
+79,8
@@
private:
int *limit_bw, int *limit_pdu, int *limit_req);
int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
char **addinfo);
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,
const char *get_text(xmlNodePtr ptr);
int check_type_1_attributes(ODR odr, xmlNodePtr ptr,
Z_AttributeList *attrs,
@@
-171,7
+178,8
@@
class YAZ_EXPORT Yaz_cql2rpn {
Yaz_cql2rpn();
~Yaz_cql2rpn();
void set_pqf_file(const char *fname);
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;
};
private:
cql_transform_t m_transform;
};
@@
-230,13
+238,17
@@
class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
int m_request_no;
int m_invalid_session;
int m_marcxml_flag;
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_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);
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;
+ 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;
int m_s2z_hit_count;
int m_s2z_packing;
Z_APDU *m_s2z_init_apdu;
@@
-244,19
+256,24
@@
class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
Z_APDU *m_s2z_present_apdu;
char *m_soap_ns;
int send_to_srw_client_error(int error);
Z_APDU *m_s2z_present_apdu;
char *m_soap_ns;
int send_to_srw_client_error(int error);
- int send_to_srw_client_ok(int hits, Z_Records *records);
+ 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_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;
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();
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);
void recv_GDU(Z_GDU *apdu, int len);
void handle_incoming_HTTP(Z_HTTP_Request *req);
void handle_incoming_Z_PDU(Z_APDU *apdu);