Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in test on 24 cores CPU test
[modules/kernel.git]
/
src
/
ModuleCatalog
/
SALOME_ModuleCatalog_Handler.cxx
diff --git
a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
index 64625ef8a5aa9cd10bc3b253a9b6bb02a20e1804..ebaa4b889e98d1dd7de24201837c9802edb37007 100644
(file)
--- a/
src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
+++ b/
src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-47,8
+47,8
@@
static int MYDEBUG = 0;
SALOME_ModuleCatalog_Handler::SALOME_ModuleCatalog_Handler(ParserPathPrefixes& pathList,
ParserComponents& moduleList,
ParserTypes& typeMap,
SALOME_ModuleCatalog_Handler::SALOME_ModuleCatalog_Handler(ParserPathPrefixes& pathList,
ParserComponents& moduleList,
ParserTypes& typeMap,
- TypeList& typeList):_
typeMap(typeMap),_typeList(typ
eList),
- _
pathList(pathList),_moduleList(modul
eList)
+ TypeList& typeList):_
pathList(pathList),_moduleList(modul
eList),
+ _
typeMap(typeMap),_typeList(typ
eList)
{
if(MYDEBUG) BEGIN_OF("SALOME_ModuleCatalog_Handler");
{
if(MYDEBUG) BEGIN_OF("SALOME_ModuleCatalog_Handler");
@@
-64,7
+64,6
@@
SALOME_ModuleCatalog_Handler::SALOME_ModuleCatalog_Handler(ParserPathPrefixes& p
test_component_name = "component-name";
test_component_username = "component-username";
test_component_type = "component-type" ;
test_component_name = "component-name";
test_component_username = "component-username";
test_component_type = "component-type" ;
- test_component_multistudy = "component-multistudy";
test_component_icon = "component-icone" ;
test_component_impltype = "component-impltype";
test_component_implname = "component-implname";
test_component_icon = "component-icone" ;
test_component_impltype = "component-impltype";
test_component_implname = "component-implname";
@@
-320,7
+319,7
@@
void SALOME_ModuleCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
{
if ( _typeMap.find(aType.name) == _typeMap.end() )
{
{
if ( _typeMap.find(aType.name) == _typeMap.end() )
{
- MESSAGE("Registered objref type: " << aType.name << " " << aType.id );
+
//
MESSAGE("Registered objref type: " << aType.name << " " << aType.id );
_typeMap[aType.name]=aType;
_typeList.push_back(aType);
}
_typeMap[aType.name]=aType;
_typeList.push_back(aType);
}
@@
-445,7
+444,10
@@
void SALOME_ModuleCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
_aModule.type = MESH ;
else if((aType.compare("MED") == 0) ||
(aType.compare("Med") == 0) ||
_aModule.type = MESH ;
else if((aType.compare("MED") == 0) ||
(aType.compare("Med") == 0) ||
- (aType.compare("med") == 0))
+ (aType.compare("med") == 0) ||
+ (aType.compare("FIELDS") == 0) ||
+ (aType.compare("Fields") == 0) ||
+ (aType.compare("fields") == 0))
_aModule.type = Med ;
else if((aType.compare("GEOM") == 0) ||
(aType.compare("Geom") == 0) ||
_aModule.type = Med ;
else if((aType.compare("GEOM") == 0) ||
(aType.compare("Geom") == 0) ||
@@
-477,10
+479,6
@@
void SALOME_ModuleCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
_aModule.type = OTHER ;
}
_aModule.type = OTHER ;
}
- // Tag test_component_multistudy
- if ( !xmlStrcmp(aComponentSubNode->name, (const xmlChar*)test_component_multistudy) )
- _aModule.multistudy = atoi( aContent.c_str() ) != 0;
-
// Tag test_component_impltype
if ( !xmlStrcmp(aComponentSubNode->name, (const xmlChar*)test_component_impltype) )
_aModule.implementationType = aContent;
// Tag test_component_impltype
if ( !xmlStrcmp(aComponentSubNode->name, (const xmlChar*)test_component_impltype) )
_aModule.implementationType = aContent;