Changeset 2113 for trunk/gsdl/src/recpt

Timestamp:

2001-03-05T13:54:26+13:00 (23 years ago)

Author:

say1

Message:

integrated the new mico package. updated corba to 2.3.7. fixed the c++ corba code. added error messages in the first few calls in the corba protocol. misc corba fixes

Location:

trunk/gsdl/src/recpt

Files:

• Makefile.in (modified) (5 diffs)
• cgiwrapper.cpp (modified) (2 diffs)
• collectoraction.cpp (modified) (5 diffs)
• corbaclient.mpp (modified) (2 diffs)
• corbaproto.h (modified) (2 diffs)
• corbaproto.mpp (modified) (4 diffs)
• documentaction.cpp (modified) (1 diff)
• nullproto.cpp (modified) (2 diffs)
• nullproto.h (modified) (1 diff)
• pageaction.cpp (modified) (1 diff)
• receptionist.cpp (modified) (2 diffs)
• recptproto.cpp (modified) (4 diffs)
• recptproto.h (modified) (2 diffs)
• statusaction.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/Makefile.in

@@ -86 +86 @@
 MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
 MLINK = mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
-MLIBS = $(LIBS) -lmico2.2.7                 
+MLIBS = $(LIBS) -L../../lib/ -lmico2.3.5 -lmicoaux2.3.5          
 
 .SUFFIXES:
@@ -328 +328 @@
 
 corbaserver: $(RECPTLIB_OBJS)
+    echo -e building corbaserver
     $(MLINK) $(RECPTLIB_OBJS) $(MLIBS)
 
@@ -335 +336 @@
 ifneq ($(USE_FASTCGI), 1)
 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \
+    ../../lib/corbaiface.o \
+    ../../lib/corbaconv_text_t.o \
+    ../../lib/corbatext_t.o \
     ../../lib/gsdllib.a  \
     ../../packages/mg/src/text/libtextin.a \
@@ -342 +346 @@
 else
 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \
+    ../../lib/corbaiface.o \
+    ../../lib/corbaconv_text_t.o \
+    ../../lib/corbatext_t.o \
     ../../lib/gsdllib.a  \
     ../../packages/mg/src/text/libtextin.a \
@@ -351 +358 @@
 
 corbarecptldd: $(CORBARECPT_OBJS)
-    $(MLINK) $(CORBARECPT_OBJS) $(MLIBS)
+    echo -e building corbarecptldd:
+    $(MLINK)  $(CORBARECPT_OBJS)  $(MLIBS) 
 
 test:

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -380 +380 @@
   bool found_valid_col = false;
 
+
   while (rprotolist_here != rprotolist_end) {
+    comerror_t err;    
     if ((*rprotolist_here).p == NULL) continue;
     else if (is_z3950==false &&
-         (*rprotolist_here).p->get_protocol_name() == "z3950proto") {
+         (*rprotolist_here).p->get_protocol_name(err) == "z3950proto") {
       cout << "\nZ39.50 Servers:   (always public)\n"
        << "---------------\n";
@@ -390 +392 @@
 
     text_tarray collist;
-    comerror_t err;
     (*rprotolist_here).p->get_collection_list (collist, err, cerr);
     if (err == noError) {

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -676 +676 @@
 
       // don't include z39.50 collection
-      if ((*rprotolist_here).p->get_protocol_name () == "z3950proto") {
+      comerror_t err;
+      if ((*rprotolist_here).p->get_protocol_name (err) == "z3950proto") {
     rprotolist_here ++;
     continue;
@@ -682 +683 @@
 
       text_tarray collist;
-      comerror_t err;
       (*rprotolist_here).p->get_collection_list (collist, err, logout);
       if (err == noError) {
@@ -1576 +1576 @@
   recptprotolistclass::iterator rprotolist_end = protos->end();
   while (rprotolist_here != rprotolist_end) {
+    comerror_t err;
     if ((*rprotolist_here).p != NULL) {
-      if ((*rprotolist_here).p->get_protocol_name () == "nullproto") {
+      if ((*rprotolist_here).p->get_protocol_name (err) == "nullproto") {
     // create collection server and add it to nullproto
     (*rprotolist_here).p->add_collection (collection, recpt, gsdlhome, gsdlhome);
@@ -1583 +1584 @@
     text_tarray tmp;
     tmp.push_back (gsdlhome);
-    (*rprotolist_here).p->configure ("gsdlhome", tmp);
+    (*rprotolist_here).p->configure ("gsdlhome", tmp, err);
     // re-initialize the null protocol
-    if (!(*rprotolist_here).p->init (logout)) {
+    if (!(*rprotolist_here).p->init (err, logout)) {
       logout << "collectoraction::create_colserver: nullproto init failed\n";
     }
@@ -1604 +1605 @@
   recptprotolistclass::iterator rprotolist_end = protos->end();
   while (rprotolist_here != rprotolist_end) {
+    comerror_t err;
     if ((*rprotolist_here).p != NULL) {
-      if ((*rprotolist_here).p->get_protocol_name () == "nullproto") {
+      if ((*rprotolist_here).p->get_protocol_name (err) == "nullproto") {
     (*rprotolist_here).p->remove_collection (collection, logout);
     return;

trunk/gsdl/src/recpt/corbaclient.mpp

@@ -49 +49 @@
 #include "authenaction.h"
 #include "extlinkaction.h"
-#include "delhistoryaction.h"
 #include "tipaction.h"
 #include "collectoraction.h"
@@ -126 +125 @@
   recpt.add_action (&aauthenaction);
 
-  delhistoryaction adelhistoryaction;
-  recpt.add_action(&adelhistoryaction);
-
   collectoraction acollectoraction;
   acollectoraction.set_receptionist (&recpt);

trunk/gsdl/src/recpt/corbaproto.h

@@ -56 +56 @@
 
   // this configure will configure each of the collection servers
-  void configure (const text_t &key, const text_tarray &cfgline);
+  void configure (const text_t &key, const text_tarray &cfgline, comerror_t &err);
 
   // this init will init each of the collection servers
-  bool init (ostream &logout);
+  bool init (comerror_t &err,ostream &logout);
 
   // used to check for icons and retrieve them from the collection
@@ -67 +67 @@
                 text_t& httpprefix);
 
-  text_t get_site_name ();
+  text_t get_site_name (comerror_t &err);
 
-  text_t get_protocol_name ();
+  text_t get_protocol_name (comerror_t &err);
   void get_collection_list (text_tarray &collist, comerror_t &err, 
                 ostream &logout);

trunk/gsdl/src/recpt/corbaproto.mpp

@@ -369 +369 @@
 
 // this configure will configure each of the collection servers
-void corbaproto::configure (const text_t &key, const text_tarray &cfgline) {
+void corbaproto::configure (const text_t &key, const text_tarray &cfgline,
+                comerror_t &err) {
   // the naming of the collection should not be done here,
   // it should be done just after the collection server has been 
@@ -399 +400 @@
 
 // this init will configure and init each of the collection servers
-bool corbaproto::init (ostream &logout) {
+bool corbaproto::init (comerror_t &err, ostream &logout) {
 //  cout << "Corbaproto::Init" << endl;
 
@@ -478 +479 @@
 }
 
-text_t corbaproto::get_site_name () {
+text_t corbaproto::get_site_name (comerror_t &err) {
   return site_name;
 }
 
-text_t corbaproto::get_protocol_name () {
+text_t corbaproto::get_protocol_name (comerror_t &err) {
   return "corbaproto";
 }
@@ -700 +701 @@
   // convert the response back to normal form
   response.numDocs = corbaResponse.numDocs;
-  response.isApprox = corbaResponse.isApprox;
+  response.isApprox = (enum isapprox) corbaResponse.isApprox;
   corbaresponse_resultDocInfoToC(corbaResponse.docInfo, response.docInfo);
 

trunk/gsdl/src/recpt/documentaction.cpp

@@ -579 +579 @@
     metadata.insert ("archivedir");
 
+    comerror_t err;
     OptionValue_tarray options;
     // we need to know what the query was for the z3950proto
-    if (collectproto->get_protocol_name()=="z3950proto") {
+    if (collectproto->get_protocol_name(err)=="z3950proto") {
       OptionValue_t opt;
       opt.name="Query";

trunk/gsdl/src/recpt/nullproto.cpp

@@ -64 +64 @@
 
 // this configure will configure each of the collection servers
-void nullproto::configure (const text_t &key, const text_tarray &cfgline) {
+void nullproto::configure (const text_t &key, const text_tarray &cfgline,
+               comerror_t &err) {
   // the naming of the collection should not be done here,
   // it should be done just after the collection server has been 
@@ -77 +78 @@
 
 // this init will configure and init each of the collection servers
-bool nullproto::init (ostream &logout) {
+bool nullproto::init (comerror_t &err, ostream &logout) {
   return cset->init(logout);
 }
 
-text_t nullproto::get_site_name () {
-  return "";
+text_t nullproto::get_site_name (comerror_t &err) {
+  return "localhost";
 }
 
-text_t nullproto::get_protocol_name () {
+text_t nullproto::get_protocol_name (comerror_t &err) {
   return "nullproto";
 }

trunk/gsdl/src/recpt/nullproto.h

@@ -55 +55 @@
 
   // this configure will configure each of the collection servers
-  void configure (const text_t &key, const text_tarray &cfgline);
+  void configure (const text_t &key, const text_tarray &cfgline,
+          comerror_t &err);
 
   // this init will init each of the collection servers
-  bool init (ostream &logout);
+  bool init (comerror_t &err, ostream &logout);
 
-  text_t get_protocol_name ();
-  text_t get_site_name ();
+  text_t get_protocol_name (comerror_t &err);
+  text_t get_site_name (comerror_t &err);
 
   void get_collection_list (text_tarray &collist, comerror_t &err, 

trunk/gsdl/src/recpt/pageaction.cpp

@@ -164 +164 @@
         homeextra += "</tr><tr valign=top>\n";
           
+          comerror_t err;
           text_t optsite = "";
-          text_t site_name = (*rprotolist_here).p->get_site_name ();
+          text_t site_name = (*rprotolist_here).p->get_site_name (err);
           if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
 

trunk/gsdl/src/recpt/receptionist.cpp

@@ -359 +359 @@
   while (protohere != protoend) {
     assert ((*protohere).p != NULL);
+    comerror_t err;
     if ((*protohere).p != NULL) 
-      (*protohere).p->configure(key, cfgline);
+      (*protohere).p->configure(key, cfgline, err);
     
     protohere++;
@@ -472 +473 @@
   recptprotolistclass::iterator protoend = protocols.end ();
   while (protohere != protoend) {
+    comerror_t err;    
     if (((*protohere).p == NULL) ||
-    !(*protohere).p->init(logout)) return false;
+    !(*protohere).p->init(err, logout)) return false;
     protohere++;
   }

trunk/gsdl/src/recpt/recptproto.cpp

@@ -37 +37 @@
 
 // configure should be called for each line in the configuration file
-void recptproto::configure (const text_t &/*key*/, const text_tarray &/*cfgline*/) {
+void recptproto::configure (const text_t &/*key*/, const text_tarray &/*cfgline*/, comerror_t &) {
 }
 
@@ -43 +43 @@
 // functions are called. If init returns false a message will be written
 // out to the log file and no other output should be produced.
-bool recptproto::init (ostream &/*logout*/) {
+bool recptproto::init (comerror_t &err, ostream &/*logout*/) {
   return true;
 }
@@ -51 +51 @@
 // connection to a site is being used then this should return the name
 // used to label a site
-text_t recptproto::get_site_name() {
-  return "";
+text_t recptproto::get_site_name(comerror_t &err) {
+  return "localhost";
 }
 
@@ -58 +58 @@
 // that can be used to do run time type identification and display information
 // about the protocol.
-text_t recptproto::get_protocol_name () {
+text_t recptproto::get_protocol_name (comerror_t &err) {
   return "recptproto";
 }

trunk/gsdl/src/recpt/recptproto.h

@@ -61 +61 @@
 
   // configure should be called for each line in the configuration file
-  virtual void configure (const text_t &key, const text_tarray &cfgline);
+  virtual void configure (const text_t &key, const text_tarray &cfgline, comerror_t &err);
 
   // init should be called after the configuration but before any other
   // functions are called. If init returns false a message will be written
   // out to the log file and no other output should be produced.
-  virtual bool init (ostream &logout);
+  virtual bool init (comerror_t &err, ostream &logout);
 
   // get_site_name should return the name of the site used.
@@ -72 +72 @@
   // connection to a site is being used then this should return the name
   // used to label a site
-  virtual text_t get_site_name();
+  virtual text_t get_site_name(comerror_t &err);
 
   // get_protocol_name should return the name of this protocol (e.g. recptproto)
   // that can be used to do run time type identification and display information
   // about the protocol.
-  virtual text_t get_protocol_name ();
+  virtual text_t get_protocol_name (comerror_t &err);
 
   // get_collection_list returns the list of collections that

trunk/gsdl/src/recpt/statusaction.cpp

@@ -62 +62 @@
   while (rprotolist_here != rprotolist_end) {
     if ((*rprotolist_here).p != NULL) {
-      text_t protoname = (*rprotolist_here).p->get_protocol_name();
+      comerror_t err;
+      text_t protoname = (*rprotolist_here).p->get_protocol_name(err);
       text_tarray collist;
-      comerror_t err;
       (*rprotolist_here).p->get_collection_list (collist, err, logout);
       if (err == noError) {
@@ -263 +263 @@
     bool protofirst = true;
     while (protohere != protoend) {
+      comerror_t err;
       if (!protofirst) textout << outconvert << ", ";
       protofirst = false;
       if ((*protohere).p != NULL) {
-    textout << outconvert << "\"" << (*protohere).p->get_protocol_name() << "\"";
+    textout << outconvert << "\"" << (*protohere).p->get_protocol_name(err) << "\"";
       }
       protohere++;
@@ -452 +453 @@
   while (rprotolist_here != rprotolist_end) {
     if ((*rprotolist_here).p != NULL) {
-      protoname = (*rprotolist_here).p->get_protocol_name();
+      comerror_t err;
+      protoname = (*rprotolist_here).p->get_protocol_name(err);
       textout << outconvert
           << "<tr><td>"
@@ -459 +461 @@
 
       text_tarray collist;
-      comerror_t err;
       (*rprotolist_here).p->get_collection_list (collist, err, logout);
       if (err == noError) {
@@ -527 +528 @@
   while (rprotolist_here != rprotolist_end) {
     rproto = (*rprotolist_here).p;
-    if (rproto != NULL && rproto->get_protocol_name() == arg_pr) {
+    comerror_t err;
+    if (rproto != NULL && rproto->get_protocol_name(err) == arg_pr) {
       // see if the protocol has the collection
       bool hascollection;
-      comerror_t err;
       rproto->has_collection (arg_c, hascollection, err, logout);
       if (err == noError && hascollection) break;