Changeset 2598 for trunk/components/tools/OmeroCpp/src/omero/client.cpp

Timestamp:

07/05/08 22:16:07 (5 months ago)

Author:

jmoore

Message:

ticket:1018 - Propagating changes to OmeroJava and OmeroCpp

Also add environment methods which have been in OmeroPy for
some time.

Files:

• trunk/components/tools/OmeroCpp/src/omero/client.cpp (modified) (6 diffs)

trunk/components/tools/OmeroCpp/src/omero/client.cpp

@@ -17 +17 @@
       throw omero::ClientError(__FILE__,__LINE__,"Improper initialization.");
     }
+    // Register Object Factory
     ObjectFactoryPtr of = new ObjectFactory();
     of->registerObjectFactory(ic);
+    // Define our unique identifier (used during close/detach)
+    ic->getImplicitContext()->put(omero::constants::CLIENTUUID, IceUtil::generateUUID());
   }
 
   client::client(const Ice::InitializationData& id) {
     ic = Ice::initialize(id);
-    close_on_destroy = false;
     init(ic);
   }
@@ -30 +32 @@
                  const Ice::InitializationData& id) {
     ic = Ice::initialize(argc, argv, id);
-    close_on_destroy = false;
     init(ic);
   }
 
   client::~client(){
-      if (close_on_destroy && sf) {
+      try {
           closeSession();
-      }
-      if (ic) {
-          try {
-              ic->destroy();
-          } catch (const Ice::Exception& ex) {
-              cerr << "Caught Ice exception while destroying communicator." << endl;
-              cerr << ex << endl;
-          }
-          ic = Ice::CommunicatorPtr();
+      } catch (...) {
+          std::cout << "Ignoring error in ~client"<< std::endl;
       }
   }
@@ -51 +45 @@
   omero::api::ServiceFactoryPrx client::createSession(const std::string& _username, const std::string& _password) {
 
+      // Check the required properties
     std::string username, password;
     if (_username.empty()) {
@@ -70 +65 @@
     }
 
+    // Acquire router and get the proxy
+    // For whatever reason, we have to se the context
+    // on the router context here as well.
     Ice::RouterPrx prx = ic->getDefaultRouter();
     if (!prx) {
         throw omero::ClientError(__FILE__,__LINE__,"No default router found.");
     }
+    prx = Ice::RouterPrx::uncheckedCast(prx->ice_context(ic->getImplicitContext()->getContext()));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(prx);
     if (!router) {
@@ -81 +80 @@
     Glacier2::SessionPrx session;
     session = router->createSession(username, password);
+    if (!session) {
+        throw omero::ClientError(__FILE__,__LINE__,"Obtained null object proxy");
+    }
+
+    // Check type
     sf = omero::api::ServiceFactoryPrx::checkedCast(session);
     if (!sf) {
-      throw omero::ClientError(__FILE__,__LINE__,"No session obtained.");
+      throw omero::ClientError(__FILE__,__LINE__,"Obtained object proxy is not a ServiceFactory.");
     }
     return sf;
@@ -89 +93 @@
 
   void client::closeSession() {
-    if (sf) {
-      try {
-        sf->close();
-      } catch (const Ice::Exception& ex) {
-        // ok
+
+      omero::api::ServiceFactoryPrx old = sf;
+      sf = omero::api::ServiceFactoryPrx();
+
+      if (!ic && old) {
+          ic = old->ice_getCommunicator();
       }
-      sf = omero::api::ServiceFactoryPrx();
-    }
-    Ice::RouterPrx prx = ic->getDefaultRouter();
-    Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(prx);
-    try {
-        router->destroySession();
-    } catch (const Ice::ConnectionLostException& cle) {
-        // ok. Always thrown.
-    }
+
+      if (ic) {
+
+          Ice::RouterPrx prx = ic->getDefaultRouter();
+          Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(prx);
+          if (router) {
+              try {
+                  router->destroySession();
+              } catch (const Ice::ConnectionLostException& cle) {
+                  // ok. Always thrown.
+              } // TODO what about SNEE
+          }
+
+          try {
+              ic->destroy();
+          } catch (const Ice::Exception& ex) {
+              cerr << "Caught Ice exception while destroying communicator." << endl;
+              cerr << ex << endl;
+          }
+          ic = Ice::CommunicatorPtr();
+      }
+
   }
 
+    // Environment methods
+    // ======================================================================
+    omero::RTypePtr client::getInput(const string& key) {
+        return env()->getInput(sess(), key);
+    }
+    omero::RTypePtr client::getOutput(const string& key) {
+        return env()->getOutput(sess(), key);
+    }
+    void client::setInput(const string& key, omero::RTypePtr value) {
+        env()->setInput(sess(), key, value);
+    }
+    void client::setOutput(const string& key, omero::RTypePtr value) {
+        env()->setOutput(sess(), key, value);
+    }
+    vector<string> client::getInputKeys() {
+        env()->getInputKeys(sess());
+    }
+    vector<string> client::getOutputKeys() {
+        env()->getOutputKeys(sess());
+    }
+    omero::api::ISessionPrx client::env() {
+        return sf->getSessionService();
+    }
+    const std::string client::sess() {
+        return sf->getAdminService()->getEventContext()->sessionUuid;
+    }
 }