projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for the yazpp_1 namespace.
[yazproxy-moved-to-github.git]
/
include
/
yazproxy
/
proxy.h
diff --git
a/include/yazproxy/proxy.h
b/include/yazproxy/proxy.h
index
7482f52
..
f217c97
100644
(file)
--- a/
include/yazproxy/proxy.h
+++ b/
include/yazproxy/proxy.h
@@
-1,4
+1,4
@@
-/* $Id: proxy.h,v 1.17 2005-05-30 20:09:20 adam Exp $
+/* $Id: proxy.h,v 1.18 2005-06-02 06:40:46 adam Exp $
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
@@
-52,7
+52,7
@@
enum YAZ_Proxy_MARCXML_mode {
class Msg_Thread;
/// Information Retrieval Proxy Server.
class Msg_Thread;
/// Information Retrieval Proxy Server.
-class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
+class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Yaz_Z_Assoc {
friend class Proxy_Msg;
private:
char *get_cookie(Z_OtherInformation **otherInfo);
friend class Proxy_Msg;
private:
char *get_cookie(Z_OtherInformation **otherInfo);
@@
-66,8
+66,8
@@
class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
void shutdown();
void releaseClient();
Yaz_ProxyClient *m_client;
void shutdown();
void releaseClient();
Yaz_ProxyClient *m_client;
- IYaz_PDU_Observable *m_PDU_Observable;
- IYazSocketObservable *m_socket_observable;
+ yazpp_1::IYaz_PDU_Observable *m_PDU_Observable;
+ yazpp_1::IYazSocketObservable *m_socket_observable;
Yaz_ProxyClient *m_clientPool;
Yaz_Proxy *m_parent;
int m_seqno;
Yaz_ProxyClient *m_clientPool;
Yaz_Proxy *m_parent;
int m_seqno;
@@
-163,7
+163,7
@@
class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
Z_DefaultDiagFormat *ddf);
int m_http_keepalive;
const char *m_http_version;
Z_DefaultDiagFormat *ddf);
int m_http_keepalive;
const char *m_http_version;
- Yaz_cql2rpn m_cql2rpn;
+ yazpp_1::Yaz_cql2rpn m_cql2rpn;
void *m_time_tv;
void logtime();
Z_ElementSetNames *mk_esn_from_schema(ODR o, const char *schema);
void *m_time_tv;
void logtime();
Z_ElementSetNames *mk_esn_from_schema(ODR o, const char *schema);
@@
-179,8
+179,8
@@
class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
Yaz_usemarcon *m_usemarcon;
Yaz_CharsetConverter *m_charset_converter;
public:
Yaz_usemarcon *m_usemarcon;
Yaz_CharsetConverter *m_charset_converter;
public:
- Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
- IYazSocketObservable *the_socket_observable,
+ Yaz_Proxy(yazpp_1::IYaz_PDU_Observable *the_PDU_Observable,
+ yazpp_1::IYazSocketObservable *the_socket_observable,
Yaz_Proxy *parent = 0);
~Yaz_Proxy();
int handle_authentication(Z_APDU *apdu);
Yaz_Proxy *parent = 0);
~Yaz_Proxy();
int handle_authentication(Z_APDU *apdu);
@@
-192,7
+192,7
@@
class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
void handle_incoming_Z_PDU(Z_APDU *apdu);
void handle_incoming_Z_PDU_2(Z_APDU *apdu);
IYaz_PDU_Observer* sessionNotify
void handle_incoming_Z_PDU(Z_APDU *apdu);
void handle_incoming_Z_PDU_2(Z_APDU *apdu);
IYaz_PDU_Observer* sessionNotify
- (IYaz_PDU_Observable *the_PDU_Observable, int fd);
+ (yazpp_1::IYaz_PDU_Observable *the_PDU_Observable, int fd);
void failNotify();
void timeoutNotify();
void connectNotify();
void failNotify();
void timeoutNotify();
void connectNotify();