Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
2c5d945b
Commit
2c5d945b
authored
Sep 16, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configuration: use iterator instead xmlNode
parent
6125521b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
Configuration.cc
src/Various/Configuration.cc
+6
-6
No files found.
src/Various/Configuration.cc
View file @
2c5d945b
...
...
@@ -218,8 +218,8 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
{
if
(
oind
==
NULL
)
{
xmlNode
*
cnode
=
unixml
.
findNode
(
unixml
.
getFirstNode
(),
"ObjectsMap"
);
if
(
!
cnode
)
UniXML_iterator
it
=
unixml
.
findNode
(
unixml
.
getFirstNode
(),
"ObjectsMap"
);
if
(
it
==
NULL
)
{
unideb
[
Debug
::
CRIT
]
<<
"(Configuration:init): not found <ObjectsMap> node in "
<<
fileConfName
<<
endl
;
throw
SystemError
(
"(Configuration:init): not found <ObjectsMap> node in "
+
fileConfName
);
...
...
@@ -227,7 +227,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
try
{
if
(
unixml
.
getIntProp
(
cnode
,
"idfromfile"
)
==
0
)
if
(
it
.
getIntProp
(
"idfromfile"
)
==
0
)
oind
=
new
ObjectIndex_XML
(
unixml
);
//(fileConfName);
else
oind
=
new
ObjectIndex_idXML
(
unixml
);
//(fileConfName);
...
...
@@ -242,12 +242,12 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
// Init MessageInterface
{
xmlNode
*
cnode
=
unixml
.
findNode
(
unixml
.
getFirstNode
(),
"messages"
);
if
(
cnode
==
NULL
)
UniXML_iterator
it
=
unixml
.
findNode
(
unixml
.
getFirstNode
(),
"messages"
);
if
(
it
==
NULL
)
mi
=
new
DefaultMessageInterface
();
else
{
if
(
unixml
.
getIntProp
(
cnode
,
"idfromfile"
)
==
0
)
if
(
it
.
getIntProp
(
"idfromfile"
)
==
0
)
mi
=
new
MessageInterface_XML
(
unixml
);
// (fileConfName);
else
mi
=
new
MessageInterface_idXML
(
unixml
);
// (fileConfName);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment