[openrtm-commit:01846] r691 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-03-12 01:52:25 +0900 (Sat, 12 Mar 2016)
New Revision: 691

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
Log:
[compat,bugfix,->RELENG_1_2] bug fix. refs #3411

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-03-11 09:45:33 UTC (rev 690)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-03-11 16:52:25 UTC (rev 691)
@@ -2669,7 +2669,8 @@
       
       comp0_name = comp_ports[0].split(".")[0]
       port0_name = comp_ports[0]
-      if len(comp0_name.split("//")) < 2:
+      
+      if comp0_name.find("://") == -1:
         comp0 = self.getComponent(comp0_name)
         if comp0 is None:
           self._rtcout.RTC_ERROR("%s not found." % comp0_name)
@@ -2698,7 +2699,7 @@
       
 
 
-      if len(comp1_name.split("//")) < 2:
+      if comp1_name.find("://") == -1:
         comp1 = self.getComponent(comp1_name)
         if comp1 is None:
           self._rtcout.RTC_ERROR("%s not found." % comp1_name)
@@ -2755,7 +2756,7 @@
       OpenRTM_aist.eraseTailBlank(tmp)
       c = tmp[0]
       if c:
-        if len(c.split("//")) < 2:
+        if c.find("://") == -1:
           comp = self.getComponent(c)
           if comp is None:
             self._rtcout.RTC_ERROR("%s not found." % c)

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2016-03-11 09:45:33 UTC (rev 690)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2016-03-11 16:52:25 UTC (rev 691)
@@ -313,9 +313,9 @@
   # virtual RTCList string_to_component(string name) = 0;
   def string_to_component(self, name):
     rtc_list = []
-    tmp = name.split("//")
+    tmp = name.split("://")
     if len(tmp) > 1:
-      if tmp[0] == "rtcname:":
+      if tmp[0] == "rtcname":
         tag = tmp[0]
         url = tmp[1]
         r = url.split("/")
@@ -491,10 +491,10 @@
   # virtual RTCList string_to_component();
   def string_to_component(self, name):
     rtc_list = []
-    tmp = name.split("//")
+    tmp = name.split("://")
     
     if len(tmp) > 1:
-      if tmp[0] == "rtcloc:":
+      if tmp[0] == "rtcloc":
         tag = tmp[0]
         url = tmp[1]
         r = url.split("/")