Changeset 2173 for trunk/gsdl/src/recpt

Timestamp:

2001-03-14T04:15:23+13:00 (23 years ago)

Author:

cs025

Message:

Improvements to configure scripts in their support of various MICO
environment considerations, particularly when MICO is on the system
paths.

Fixed CORBA version of ping to correspond with parameters etc. of the
native form.

Finally, improved PING action to be more than a simple call to
the HASCOLLECTION action in the null protocol.

Location:

trunk/gsdl/src/recpt

Files:

• Makefile.in (modified) (2 diffs)
• corbaproto.mpp (modified) (3 diffs)
• nullproto.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/Makefile.in

@@ -65 +65 @@
 endif
 MICO_DIR = @MICO_DIR@
+MICO_VER = @MICO_VER@
 ifeq ($(MICO_DIR), yes)
 MICO_INC =
 MICO_LIB =
+MICO_PATH =
 else
 ifeq ($(MICO_DIR), default)
 MICO_DIR = ../../packages/mico/include
+MICO_PATH = ../../bin/linux/
 endif
 MICO_INC = -I$(MICO_DIR)
 MICO_LIB = -L$(MICO_DIR)
+MICO_PATH =
 endif
 MINCLUDES = -I. -I../../lib -I../colservr $(MICO_INC)
@@ -89 +93 @@
 CPPLINK = $(CPP) $(LDFLAGS) -o $@
 
-MCOMPILE = ../../bin/linux/mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
-MLINK = ../../bin/linux/mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
-MLIBS = $(LIBS) -L../../lib/ -lmico2.3.5 -lmicoaux2.3.5          
+MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
+MLINK = $(MICO_PATH)mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
+MLIBS = $(LIBS) -L../../lib/ -lmico$(MICO_VER) -lmicoaux$(MICO_VER)
 
 .SUFFIXES:

trunk/gsdl/src/recpt/corbaproto.mpp

@@ -389 +389 @@
 
   // execute the corba transaction
-  lclient->configure(corbaKey, corbaCfgline, error);  
-
-  
+  lclient->configure(corbaKey, corbaCfgline, error);    
 
   if (key=="gsdlhome")
@@ -541 +539 @@
 void corbaproto::ping (const text_t &collection, bool &wassuccess, 
               comerror_t &err, ostream &/*logout*/) {
-  //  cout << "Corbaproto::Ping" << endl;
+  // cout << "Corbaproto::Ping" << endl;
 
   corbatext_t corbaCollect;
   corbaComError corbaError;
-  bool success;
+  CORBA::Boolean success;
 
   // get the corba client reference
@@ -555 +553 @@
 
   // execute the corba transaction
-  success = lclient->ping(corbaCollect, corbaError);
+  lclient->ping(corbaCollect, success, corbaError);
   
   // convert the response back to normal form

trunk/gsdl/src/recpt/nullproto.cpp

@@ -105 +105 @@
 
 void nullproto::ping (const text_t &collection, bool &wassuccess, 
-              comerror_t &err, ostream &/*logout*/) {
-  wassuccess = (cset->getCollectServer(collection) != NULL);
-  err = noError;
+              comerror_t &err, ostream &logout) {
+  collectserver *cserver = cset->getCollectServer(collection);
+  if (cserver != NULL) cserver->ping(wassuccess, err, logout);
+  else err = protocolError;
 }