From: abd <abd@opencascade.com>
Date: Tue, 24 Oct 2006 08:17:39 +0000 (+0000)
Subject: Fix ModuleCatalog arguments on Linux
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=384f8db08d84fe5677db7d9e681f79e0fc89fca7;p=modules%2Fkernel.git

Fix ModuleCatalog arguments on Linux
---

diff --git a/bin/runSalome.py b/bin/runSalome.py
index d35b96b3e..ec9ea0136 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -140,7 +140,8 @@ class CatalogServer(Server):
                                                module_cata)))
                 pass
             pass
-        self.CMD=self.SCMD1 + ['\"']+[string.join(cata_path,'\"::\"')] + ['\"'] + self.SCMD2
+        #self.CMD=self.SCMD1 + ['\"']+[string.join(cata_path,'\"::\"')] + ['\"'] + self.SCMD2
+        self.CMD=self.SCMD1 + ['\"' + string.join(cata_path,'\"::\"') + '\"'] + self.SCMD2
 
 # ---
 
@@ -273,7 +274,8 @@ class SessionServer(Server):
             pass
         if (self.args["gui"]) & ('moduleCatalog' in self.args['embedded']):
             #Use '::' instead ":" because drive path with "D:\" is invalid on windows platform
-            self.CMD=self.SCMD1 + ['\"']+[string.join(cata_path,'\"::\"')] + ['\"'] + self.SCMD2
+            #self.CMD=self.SCMD1 + ['\"']+[string.join(cata_path,'\"::\"')] + ['\"'] + self.SCMD2
+            self.CMD=self.SCMD1 + ['\"' + string.join(cata_path,'\"::\"') + '\"'] + self.SCMD2
         else:
             self.CMD=self.SCMD1 + self.SCMD2
       
diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index 528df6d8f..ed938bc8b 100644
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -115,7 +115,8 @@ SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA:
 			    false ); // skip empty entries
     
     for ( int i = 0; i < dirList.count(); i++ ) {
-      QFileInfo fileInfo( dirList[ i ] );
+      //QFileInfo fileInfo( dirList[ i ] );
+      QFileInfo fileInfo( dirList[ i ].replace( '\"', "" ) ); //remove inverted commas from filename
       if ( fileInfo.isFile() && fileInfo.exists() ) {
 	_parse_xml_file(fileInfo.filePath(), 
 			_general_module_list,