X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FNSparam.py;h=a9fca83d03c6b0ea60c50a58971df7a0eacaf0e9;hb=d8edd4804d9e6513a17c497c1a30326d4ba0d677;hp=5ec527e11dedba4a18b6316e8ac8564804c7155d;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git

diff --git a/bin/NSparam.py b/bin/NSparam.py
index 5ec527e11..a9fca83d0 100755
--- a/bin/NSparam.py
+++ b/bin/NSparam.py
@@ -1,26 +1,28 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+#! /usr/bin/env python3
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2021  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
+#
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either 
-# version 2.1 of the License.
-# 
-# This library is distributed in the hope that it will be useful 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of 
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public  
-# License along with this library; if not, write to the Free Software 
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-# 
+#
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-# 
+#
 
 import sys,os
-import string
 
 def getNSparams(info=""):
     """
@@ -32,57 +34,43 @@ def getNSparams(info=""):
     elif info==port print host
     else    print 2 strings on stdout on one line: host port
     """
-    my_port=""
-    my_host=""
-    if os.environ.has_key("OMNIORB_CONFIG"):
-        file = open(os.environ["OMNIORB_CONFIG"], "r")
-        s = file.read()
-        while len(s):
-            l = string.split(s, ":")
-            if string.split(l[0], " ")[0] == "ORBInitRef" or \
-               string.split(l[0], " ")[0] == "InitRef" :
-                my_port = l[len(l)-1]
-                if my_port[-1] == '\n':
-                    my_port = my_port[:-1]
-                    pass
-                my_host = l[len(l)-2]
-                break;
-                pass
-            s = file.read()
-            pass
-        pass
+    from salome_utils import getORBcfgInfo
+    _, my_host, my_port = getORBcfgInfo()
     if info=='host':
-        # keep print, stdout used in shell
-        print my_host
-        os.environ['NSHOST']=my_host
+        os.environ['NSHOST'] = my_host
         return my_host
         pass
     elif info=='port':
-        # keep print, stdout used in shell
-        print my_port
-        os.environ['NSPORT']=my_port
+        os.environ['NSPORT'] = my_port
         return my_port
         pass
     else:
-        # keep print, stdout used in shell
-        print  my_host, my_port
         return my_host, my_port
     pass
+#
 
 # ------------------------------------------------------------------------
 
 if __name__ == "__main__":
-    if len(sys.argv) >1:        
+    if len(sys.argv) >1:
         if sys.argv[1]=='host':
-            getNSparams('host')
+            my_host = getNSparams('host')
+            # keep print, stdout used in shell
+            print(my_host)
             pass
         elif sys.argv[1]=='port':
-            getNSparams('port')
+            my_port = getNSparams('port')
+            # keep print, stdout used in shell
+            print(my_port)
             pass
         else:
-            getNSparams('')
+            my_host, my_port = getNSparams()
             pass
         pass
     else:
-        getNSparams('')
+        my_host, my_port = getNSparams()
+        # keep print, stdout used in shell
+        print(my_host, my_port)
         pass
+    pass
+#