Changeset 9924

Timestamp:

2005-05-23T15:47:28+12:00 (19 years ago)

Author:

davidb

Message:

z3950_server (and associated names) renamed to z3950_proxy to better reflect
what was being accomplished. For the Z39.50 client receptionist this
code performs the work of communicating with a Z39.50 server. It is not
actually a server itself. The distinction is important with the introduction
of Z39.50 server support for greenstone (in colsrvr). That really is a
server, and so this renaming also helps reduce possible misunderstandings
and name conflicts.

Location:

trunk/gsdl/src/recpt

Files:

• z3950proto.cpp (modified) (9 diffs)
• z3950proto.h (modified) (2 diffs)

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -54 +54 @@
 }
 
-void z3950proto::add_server (z3950_server& zserver) {
+void z3950proto::add_server (z3950_proxy& zserver) {
 
   // append the new server
@@ -64 +64 @@
   struct z3950cfg *here;
   struct z3950cfg *oldhere;
-  z3950_server *zserver;
+  z3950_proxy *zserver;
   ShortColInfo_t *tempinfo;
 
@@ -100 +100 @@
   // the parser will have already spat out any errors.
 
-  // now create z3950servers for each structure in server_list
+  // now create z3950 proxies for each structure in server_list
   here=zserver_list;
   while (here!=NULL) {
-    zserver=new z3950_server;
+    zserver=new z3950_proxy;
     tempinfo=new ShortColInfo_t;
 
@@ -188 +188 @@
                       ostream &/*logout*/) {
 
-  z3950_server_array::iterator here = zservers.begin();
-  z3950_server_array::iterator end = zservers.end();
+  z3950_proxy_array::iterator here = zservers.begin();
+  z3950_proxy_array::iterator end = zservers.end();
   while (here != end) {
     collist.push_back((*here)->getName());
@@ -198 +198 @@
 void z3950proto::has_collection (const text_t &collection, bool &hascollection,
                  comerror_t &/*err*/, ostream &/*logout*/) {
-  z3950_server_array::iterator here = zservers.begin();
-  z3950_server_array::iterator end = zservers.end();
+  z3950_proxy_array::iterator here = zservers.begin();
+  z3950_proxy_array::iterator end = zservers.end();
   while (here != end) {
     if((*here)->getName()==collection) {
@@ -224 +224 @@
   err=noError;
 
-  z3950_server_array::iterator here = zservers.begin();
-  z3950_server_array::iterator end = zservers.end();
+  z3950_proxy_array::iterator here = zservers.begin();
+  z3950_proxy_array::iterator end = zservers.end();
   while (here != end) {
     if((*here)->getName()==collection) {
@@ -321 +321 @@
 
   // get relevant "collection"
-  z3950_server_array::iterator zserver = zservers.begin();
-  z3950_server_array::iterator zend = zservers.end();
+  z3950_proxy_array::iterator zserver = zservers.begin();
+  z3950_proxy_array::iterator zend = zservers.end();
   while (zserver != zend) {
     if((*zserver)->getName()==collection) {
@@ -480 +480 @@
         text_t doctext="unneeded";
         /* following variables aren't used, as our query result has been
-           cached in z3950server.cpp (but really we shouldn't know that
+           cached in z3950proxy.cpp (but really we shouldn't know that
            here...) But for the NullFilter, we don't get given these
            again in the request, so for now we'll take advantage of this.*/
@@ -564 +564 @@
 
   // get relevant "collection"
-  z3950_server_array::iterator zserver = zservers.begin();
-  z3950_server_array::iterator zend = zservers.end();
+  z3950_proxy_array::iterator zserver = zservers.begin();
+  z3950_proxy_array::iterator zend = zservers.end();
   while (zserver != zend) {
     if((*zserver)->getName()==collection) {

trunk/gsdl/src/recpt/z3950proto.h

@@ -28 +28 @@
 
 #include "recptproto.h"
-#include "z3950server.h"
+#include "z3950proxy.h"
 
 class z3950proto : public recptproto {
 protected:
   int zserver_count;
-  z3950_server_array zservers;
+  z3950_proxy_array zservers;
 public:
   z3950proto();
@@ -44 +44 @@
   */
   
-  void add_server(z3950_server& zserver);
+  void add_server(z3950_proxy& zserver);
 
   void read_config_file(const text_t &filename, const text_t &errfile);