Changeset 1074 for branches/corba/gsdl/src/colservr/corbaServer.mpp

Timestamp:

2000-04-06T23:11:40+12:00 (24 years ago)

Author:

cs025

Message:

Corba improvements; tidied client initialisation in corbaproto and also
added a number of changes to the main trunk which somehow had not made
it into the corba branch via update before its instantiation.

Also the dated use of the GSDL_GSDLHOME macro was removed, at the expense
of some particularly poor code in corbaserver where log file creation is
now nowhere near so elegant.

File:

• branches/corba/gsdl/src/colservr/corbaServer.mpp (modified) (14 diffs)

branches/corba/gsdl/src/colservr/corbaServer.mpp

@@ -10 +10 @@
 // library headers
 #include "fileutil.h"
-#include "gsdlhome.h"
+//#include "gsdlhome.h"
 
 // greenstone headers
@@ -25 +25 @@
 void corbaresponse_resultDocInfoToCorba(ResultDocInfo_tarray docinfo, corbaResultDocInfo_array &corbainfo);
 
-void corbaresponse_termInfoToCorba(TermInfo_tarray terminfo, corbaTermInfo_array &corbainfo)
-{
+void corbaresponse_termInfoToCorba(TermInfo_tarray terminfo, corbaTermInfo_array &corbainfo) {
   TermInfo_tarray::iterator here = terminfo.begin();
   TermInfo_tarray::iterator end  = terminfo.end();
   unsigned int i;
-
+    
   i = 0;
 
-  while (here != end)
+  while (here != end) 
     {
       corbainfo.length(i+1);
@@ -68 +67 @@
   text_tarray collections;
   recptproto *protocol;
+  text_t      gsdlhome;
 public:
-  corbaServer(recptproto *protocol)
-  {
-    cout << GSDL_GSDLHOME << endl;
-    if (!read_dir (GSDL_GSDLHOME "/collect", collections)) exit (1);
+  corbaServer(recptproto *protocol, text_t home)
+  { 
+    text_t dirname;
+    char * cdirname;
+    this->gsdlhome = home;
+    cout << gsdlhome.getcstr() << endl;
+    dirname = filename_cat(gsdlhome, "/collect");
+    cdirname = dirname.getcstr();
+    if (!read_dir (cdirname, collections)) exit (1);
+    delete cdirname;
+
     cout << "Constructing set list server" << endl;
     this->protocol = protocol;
   }
 
-  CORBA::Boolean init()
-    {
-      ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
+  CORBA::Boolean init() 
+  {
+      char *cfname; 
+      text_t fname;
+      fname = filename_cat(gsdlhome, "/etc/corbaout.txt");
+      cfname = fname.getcstr();
+      ofstream    logout(cfname);
+      delete cfname;
+
       int         reply;
 
@@ -104 +117 @@
     bool    _has;
     comerror_t err;
-    ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
 
     cct = new corbaconv_text_t(corbaCollect);
@@ -129 +148 @@
 
   CORBA::Boolean ping(const struct corbatext_t &corbaCollect, corbaComError &corbaError)
-    { 
-      text_t collection;
-      bool   success;
-      comerror_t error;
-      ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
-
-
-      corbaconv_text_t::setCorbatext(collection,corbaCollect);
-      protocol->ping(collection, success, error, logout);
-
-      corbaError = (corbaComError) error;
-      logout.close();
-
-      return success;
-    }
+  { 
+    text_t collection;
+    bool   success;
+    comerror_t error;
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
+
+    corbaconv_text_t::setCorbatext(collection,corbaCollect);
+    protocol->ping(collection, success, error, logout);
+
+    corbaError = (corbaComError) error;
+    logout.close();
+
+    return success;
+  }
 
   void filter(const struct corbatext_t &corbaCollect,
@@ -155 +179 @@
     comerror_t       error = noError;
     text_t           collection;
-    ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
 
     // copy collection id
@@ -191 +221 @@
     comerror_t       error;
     text_t           collection;
-    ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
 
     corbaconv_text_t::setCorbatext(collection,corbaCollect);
@@ -200 +236 @@
     corbaResponse.buildDate = response.buildDate;
     corbatext_arrayToCorbaArray(response.languages, &corbaResponse.languages);
+    corbatext_arrayToCorbaArray(response.ccsCols, &corbaResponse.ccsCols);
     corbaResponse.numDocs  = response.numDocs;
     corbaResponse.numBytes  = response.numWords;
@@ -222 +259 @@
     InfoFilterOptionsResponse_t response;
     comerror_t error;
-    ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
     unsigned int i;
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
 
     corbaconv_text_t::setCorbatext(collection,corbaCollect);
@@ -265 +308 @@
     text_t collection;    
     InfoFiltersResponse_t response;
-    ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
 
     corbaconv_text_t::setCorbatext(collection,corbaCollect);
@@ -283 +332 @@
     comerror_t         error = noError;
     text_t             collection;
-    ofstream           logout(GSDL_GSDLHOME "/etc/corbaout.txt");
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
 
     // set up request
@@ -309 +364 @@
     text_tarray collist;
     comerror_t  err;
-    ofstream    logout(GSDL_GSDLHOME "/etc/corbaout.txt");
+
+    char *   cfname;
+    text_t   fname;
+    fname  = filename_cat(gsdlhome, "/etc/corbaout.txt");
+    cfname = fname.getcstr();
+    ofstream logout(cfname);
+    delete   cfname;
 
     protocol->get_collection_list(collist, err, logout);
@@ -353 +414 @@
   cout << "Initialised ORB and BOA" << endl;
 
-  corbaServer* server = new corbaServer(&protocol);
+  corbaServer* server = new corbaServer(&protocol, gsdlhome);
   CORBA::String_var ref = orb->object_to_string( server );
 
@@ -362 +423 @@
   out << ref << endl;
   out.close ();
+
+  cout << "Corba string is " << ref << endl;
 
   // indicate readiness and run