X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FNSparam.py;h=bbc4d3c16a30f3fd49dd51555e0ce8facff4f620;hb=2cb5ecb3b8e2a43f35a5fafc0176d326e1f039bd;hp=721c6a0f9ea77d22bf0f69416feae4580b5bf611;hpb=8d460095eb020326e642fd2021c1f613e785b744;p=modules%2Fkernel.git diff --git a/bin/NSparam.py b/bin/NSparam.py index 721c6a0f9..bbc4d3c16 100755 --- a/bin/NSparam.py +++ b/bin/NSparam.py @@ -1,7 +1,27 @@ -#!/usr/bin/env python - +#! /usr/bin/env python +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2007-2008 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 +# 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 +# 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=""): """ @@ -13,25 +33,8 @@ 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_version, my_host, my_port = getORBcfgInfo() if info=='host': # keep print, stdout used in shell print my_host @@ -61,9 +64,10 @@ if __name__ == "__main__": getNSparams('port') pass else: - getNSparams('') + getNSparams() pass pass else: - getNSparams('') + getNSparams() pass + pass