Fix ModuleCatalog arguments on Linux

diff --git a/bin/runSalome.py b/bin/runSalome.py
index d35b96b3e566c35b1daf0a997632e120341932b6..ec9ea013653d39e23f610aee919c85d4ef0c23f5 100755 (executable)
--- 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 528df6d8fc35af4240e2b4b429396e296fa86010..ed938bc8ba7ce1574245fd4a6cd3ec69d3a1adf9 100644 (file)
--- 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,