[pytango] 280/483: added get_*_ior

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit e088342a66941e187f8e4db9b9971a0e2ed0993f
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Tue Sep 24 12:41:16 2013 +0000

    added get_*_ior
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@23761 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 src/boost/cpp/server/tango_util.cpp | 65 +++++++++----------------------------
 1 file changed, 16 insertions(+), 49 deletions(-)

diff --git a/src/boost/cpp/server/tango_util.cpp b/src/boost/cpp/server/tango_util.cpp
index 65940a6..1dede21 100644
--- a/src/boost/cpp/server/tango_util.cpp
+++ b/src/boost/cpp/server/tango_util.cpp
@@ -194,60 +194,26 @@ namespace PyUtil
         Tango::Util::_UseDb = use_db;
     }
     
-    std::string get_orb_ior(Tango::Util& self)
+    boost::python::str get_dserver_ior(Tango::Util& self, Tango::DServer* dserver)
     {
-        Tango::Device_var d = self.get_dserver_device()->_this();
-        return self.get_orb()->object_to_string(d);
+        const char *ior = self.get_orb()->object_to_string(dserver->_this());
+        boost::python::str ret = ior;
+        delete [] ior;
+        return ret;
+    }
+
+    boost::python::str get_device_ior(Tango::Util& self, Tango::DeviceImpl* device)
+    {
+        const char *ior = self.get_orb()->object_to_string(device->get_d_var());
+        boost::python::str ret = ior;
+        delete [] ior;
+        return ret;
     }
     
     void orb_run(Tango::Util& self)
     {
         self.get_orb()->run();
     }
-    
-    bool init_db_ds(Tango::Util& self, boost::python::object py_device, const std::string &db_name)
-    {
-        Tango::DeviceImpl* dbase = boost::python::extract<Tango::DeviceImpl*>(py_device);
-        
-        //
-        // Export devices to the outside world as CORBA named servant and to TANGO
-        // database
-        //
-		Tango::DeviceImpl *dserver;
-        Tango::DevVarStringArray *export_parms = new Tango::DevVarStringArray();
-
-		dserver = self.get_dserver_device();
-		dbase = self.get_device_by_name(db_name);
-        //
-        // export database as named servant 
-        //
-		export_parms->length(5);
-
-        // export dserver object to TANGO database
-
-		Tango::Device_var d = dserver->_this();
-		dserver->set_d_var(Tango::Device::_duplicate(d));
-
-		const char *dserver_str_ior = Tango::Util::instance()->get_orb()->object_to_string(d);
-		const char *str_ior = Tango::Util::instance()->get_orb()->object_to_string(dbase->get_d_var());
-
-        boost::python::tuple dserver_pars = boost::python::make_tuple(dserver->get_name(),
-            dserver_str_ior, self.get_host_name(),
-            self.get_pid_str(), self.get_version_str());   
-        py_device("db_export_device")(dserver_pars);
-
-        // export database object to TANGO database        
-
-        boost::python::tuple pars = boost::python::make_tuple(dbase->get_name(),
-            str_ior, self.get_host_name(),
-            self.get_pid_str(), self.get_version_str());   
-        py_device("db_export_device")(pars);
-
-		delete [] str_ior;
- 		delete [] dserver_str_ior;
- 		
- 		return true;
-   }
 }
 
 void init_python()
@@ -324,14 +290,15 @@ void export_util()
         .def("get_device_by_name", &PyUtil::get_device_by_name)
         .def("get_device_list", &PyUtil::get_device_list)
         .def("server_set_event_loop", &PyUtil::server_set_event_loop)
+        .def("set_interceptors", &Tango::Util::set_interceptors)
         .def_readonly("_UseDb", &Tango::Util::_UseDb)
         .def_readonly("_FileDb", &Tango::Util::_FileDb)
         .def("init_python", init_python)
         .staticmethod("init_python")
         .def("set_use_db", &PyUtil::set_use_db)
         .staticmethod("set_use_db")
-        .def("get_orb_ior", &PyUtil::get_orb_ior)
+        .def("get_dserver_ior", &PyUtil::get_dserver_ior)
+        .def("get_device_ior", &PyUtil::get_device_ior)
         .def("orb_run", &PyUtil::orb_run)
-        .def("init_db_ds", &PyUtil::init_db_ds)
     ;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git