Merge from V5_1_main 14/05/2010

[modules/kernel.git] / src / Container / SALOME_Container.py

diff --git a/src/Container/SALOME_Container.py b/src/Container/SALOME_Container.py
index 9b6d7f89342ab24bcde3d6c46171d96a521193e7..d3dfc6482f4333cd8ec2901b90a77cb419d84a00 100644 (file)
--- a/src/Container/SALOME_Container.py
+++ b/src/Container/SALOME_Container.py
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  -*- coding: iso-8859-1 -*-
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,20 +21,28 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  SALOME Container : implementation of container and engine for Kernel
 #  File   : SALOME_Container.py
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME
 #  $Header$
+
+## @package SALOME_Container
+# \brief python implementation of container interface for Kernel
 #
+
 import os
 import sys
 import string
+import traceback
+import imp
 from omniORB import CORBA, PortableServer
-import SALOMEDS 
+import SALOMEDS
 import Engines, Engines__POA
 from SALOME_NamingServicePy import *
 from SALOME_ComponentPy import *
+import SALOME_PyNode
 
 from SALOME_utilities import *
 from Utils_Identity import getShortHostName
@@ -41,7 +50,7 @@ from launchConfigureParser import verbose
 
 #=============================================================================
 
-#define an implementation of the container interface
+#define an implementation of the container interface for embedding in Container implemented in C++
 
 class SALOME_Container_i:
     _orb = None
@@ -62,20 +71,31 @@ class SALOME_Container_i:
 
     #-------------------------------------------------------------------------
 
-    #def __del__(self ):
-    #  self._orb.destroy()
-
     def import_component(self, componentName):
         MESSAGE( "SALOME_Container_i::import_component" )
-        ret=0
+        ret=""
         try:
             if verbose(): print "try import ",componentName
             __import__(componentName)
             if verbose(): print "import ",componentName," successful"
-            ret=1
+        except ImportError,e:
+            #can't import python module componentName
+            #try to find it in python path
+            try:
+              fp, pathname, description = imp.find_module(componentName)
+              if fp:fp.close()
+              #module file found in path
+              ret="Component "+componentName+": Python implementation found but it can't be loaded\n"
+              ret=ret+traceback.format_exc(10)
+            except ImportError,ee:
+              ret="ImplementationNotFound"
+            except:
+              if verbose():print "error when calling find_module"
+              ret="ImplementationNotFound"
         except:
+            ret="Component "+componentName+": Python implementation found but it can't be loaded\n"
+            ret=ret+traceback.format_exc(10)
             if verbose():
-              import traceback
               traceback.print_exc()
               print "import ",componentName," not possible"
         return ret
@@ -85,6 +105,7 @@ class SALOME_Container_i:
     def create_component_instance(self, componentName, instanceName, studyId):
         MESSAGE( "SALOME_Container_i::create_component_instance" )
         comp_iors=""
+        ret=""
         try:
             component=__import__(componentName)
             factory=getattr(component,componentName)
@@ -99,9 +120,20 @@ class SALOME_Container_i:
             comp_o = comp_i._this()
             comp_iors = self._orb.object_to_string(comp_o)
         except:
-            import traceback
+            ret=traceback.format_exc(10)
             traceback.print_exc()
             MESSAGE( "SALOME_Container_i::create_component_instance : NOT OK")
-        return comp_iors 
+        return comp_iors, ret
         
 
+    def create_pynode(self,nodeName,code):
+        try:
+          node=SALOME_PyNode.PyNode_i(nodeName,code,self._poa)
+          id_o = self._poa.activate_object(node)
+          comp_o = self._poa.id_to_reference(id_o)
+          comp_iors = self._orb.object_to_string(comp_o)
+          return 0,comp_iors
+        except:
+          exc_typ,exc_val,exc_fr=sys.exc_info()
+          l=traceback.format_exception(exc_typ,exc_val,exc_fr)
+          return 1,"".join(l)