Update for the yazpp_1 namespace.

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.
@@ -52,7 +52,7 @@ enum YAZ_Proxy_MARCXML_mode {
 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);
@@ -66,8 +66,8 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     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;
@@ -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;
-    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);
@@ -179,8 +179,8 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc {
     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);
@@ -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
-       (IYaz_PDU_Observable *the_PDU_Observable, int fd);
+       (yazpp_1::IYaz_PDU_Observable *the_PDU_Observable, int fd);
     void failNotify();
     void timeoutNotify();
     void connectNotify();

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index 3315e26..78c3c31 100644 (file)
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.cpp,v 1.1 2005-05-30 20:08:58 adam Exp $
+/* $Id: msg-thread.cpp,v 1.2 2005-06-02 06:40:46 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -27,6 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "msg-thread.h"
 
+using namespace yazpp_1;
+
 Msg_Thread_Queue::Msg_Thread_Queue()
 {
     m_list = 0;

diff --git a/src/msg-thread.h b/src/msg-thread.h
index 0d0729f..725c8ad 100644 (file)
--- a/src/msg-thread.h
+++ b/src/msg-thread.h
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.h,v 1.1 2005-05-30 20:08:58 adam Exp $
+/* $Id: msg-thread.h,v 1.2 2005-06-02 06:40:46 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -53,9 +53,9 @@ class Msg_Thread_Queue {
     Msg_Thread_Queue_List *m_list;
 };
 
-class Msg_Thread : public IYazSocketObserver {
+class Msg_Thread : public yazpp_1::IYazSocketObserver {
  public:
-    Msg_Thread(IYazSocketObservable *obs);
+    Msg_Thread(yazpp_1::IYazSocketObservable *obs);
     virtual ~Msg_Thread();
     void socketNotify(int event);
     void put(IMsg_Thread *m);
@@ -63,7 +63,7 @@ class Msg_Thread : public IYazSocketObserver {
     void run(void *p);
     int m_fd[2];
 private:
-    IYazSocketObservable *m_SocketObservable;
+    yazpp_1::IYazSocketObservable *m_SocketObservable;
     pthread_t m_thread_id;
     Msg_Thread_Queue m_input;
     Msg_Thread_Queue m_output;

diff --git a/src/proxyp.h b/src/proxyp.h
index f36d182..1019e55 100644 (file)
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,4 +1,4 @@
-/* $Id: proxyp.h,v 1.5 2005-05-18 20:15:22 adam Exp $
+/* $Id: proxyp.h,v 1.6 2005-06-02 06:40:46 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -31,6 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <objectlist.h>
 #endif
 
+#include <yaz++/record-cache.h>
 #include <yazproxy/proxy.h>
 #include <yazproxy/module.h>
 
@@ -137,40 +138,16 @@ public:
     class Yaz_ProxyConfigP *m_cp;
 };
 
-class Yaz_RecordCache {
- public:
-    Yaz_RecordCache ();
-    ~Yaz_RecordCache ();
-    void add (ODR o, Z_NamePlusRecordList *npr, int start, int hits);
-    
-    int lookup (ODR o, Z_NamePlusRecordList **npr, int start, int num,
-               Odr_oid *syntax, Z_RecordComposition *comp);
-    void clear();
-
-    void copy_searchRequest(Z_SearchRequest *sr);
-    void copy_presentRequest(Z_PresentRequest *pr);
-    void set_max_size(int sz);
- private:
-    NMEM m_mem;
-    Yaz_RecordCache_Entry *m_entries;
-    Z_SearchRequest *m_searchRequest;
-    Z_PresentRequest *m_presentRequest;
-    int match (Yaz_RecordCache_Entry *entry,
-              Odr_oid *syntax, int offset,
-              Z_RecordComposition *comp);
-    int m_max_size;
-};
-
-class Yaz_ProxyClient : public Yaz_Z_Assoc {
+class Yaz_ProxyClient : public yazpp_1::Yaz_Z_Assoc {
     friend class Yaz_Proxy;
-    Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable,
+    Yaz_ProxyClient(yazpp_1::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);
+       (yazpp_1::IYaz_PDU_Observable *the_PDU_Observable, int fd);
     void shutdown();
     Yaz_Proxy *m_server;
     void failNotify();
@@ -182,8 +159,8 @@ class Yaz_ProxyClient : public Yaz_Z_Assoc {
     Yaz_ProxyClient *m_next;
     Yaz_ProxyClient **m_prev;
     int m_init_flag;
-    Yaz_Z_Query *m_last_query;
-    Yaz_Z_Databases m_last_databases;
+    yazpp_1::Yaz_Z_Query *m_last_query;
+    yazpp_1::Yaz_Z_Databases m_last_databases;
     char *m_last_resultSetId;
     int m_last_ok;
     int m_last_resultCount;
@@ -200,7 +177,7 @@ class Yaz_ProxyClient : public Yaz_Z_Assoc {
     Z_ProtocolVersion *m_initResponse_version;
     int m_initResponse_preferredMessageSize;
     int m_initResponse_maximumRecordSize;
-    Yaz_RecordCache m_cache;
+    yazpp_1::Yaz_RecordCache m_cache;
     void pre_init_client();
     int m_target_idletime;
     Yaz_Proxy *m_root;

diff --git a/src/tstthreads.cpp b/src/tstthreads.cpp
index ae54b79..60ca4f7 100644 (file)
--- a/src/tstthreads.cpp
+++ b/src/tstthreads.cpp
@@ -1,4 +1,4 @@
-/* $Id: tstthreads.cpp,v 1.3 2005-05-30 20:08:58 adam Exp $
+/* $Id: tstthreads.cpp,v 1.4 2005-06-02 06:40:46 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -27,6 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/log.h>
 #include "msg-thread.h"
 
+using namespace yazpp_1;
+
 class My_Msg : public IMsg_Thread {
 public:
     IMsg_Thread *handle();

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 4257c79..b439ba4 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy-main.cpp,v 1.13 2005-05-30 20:09:21 adam Exp $
+/* $Id: yaz-proxy-main.cpp,v 1.14 2005-06-02 06:40:46 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -56,6 +56,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <libxslt/transform.h>
 #endif
 
+using namespace yazpp_1;
+
 void usage(char *prog)
 {
     fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] "

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 6aae564..c1cc98f 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy.cpp,v 1.28 2005-05-30 20:09:21 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.29 2005-06-02 06:40:46 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -53,6 +53,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/charneg.h>
 #include "msg-thread.h"
 
+using namespace yazpp_1;
+
 class Auth_Msg : public IMsg_Thread {
 public:
     int m_ret;