Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Using constants in XML files #20

Merged
merged 8 commits into from
Sep 27, 2017
Merged

Using constants in XML files #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3e4f3d
Added constants processing in processor parameter values and global p…
rete Sep 25, 2017
a76ed27
Added command line constants parsing
rete Sep 26, 2017
0ff954d
Throw exception if constant not found while calling performConstantRe…
rete Sep 26, 2017
6884957
Changed order of processing of includes and constants. Constants are …
rete Sep 26, 2017
2b2881f
Modify include mechanism to using constants in ref attribute
rete Sep 26, 2017
5671a60
Reversed order of constant replacment and ref check in include element
rete Sep 26, 2017
c4e205b
Added cmake test to test include mechanism and constants section
rete Sep 26, 2017
6c42890
Fixed bug for string search "${" using the wrong string method. Missi…
rete Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions source/include/marlin/XMLParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ namespace marlin{

/** Extracts all parameters from the given node and adss them to the current StringParameters object
*/
void parametersFromNode(TiXmlNode* section, std::pair<unsigned,unsigned>* typeCount=0) ;
void parametersFromNode(TiXmlNode* section, std::map<std::string, std::string>& constants, std::pair<unsigned,unsigned>* typeCount=0) ;

/** Return named attribute - throws ParseException if attribute doesn't exist */
const char* getAttribute( TiXmlNode* node , const std::string& name ) ;
Expand All @@ -188,7 +188,14 @@ namespace marlin{
/** Helper method - recursively replace all <include ref="..."> with the corresponding
* file content
*/
void processIncludeElements( TiXmlElement* element );
void processIncludeElements( TiXmlElement* element , const std::map<std::string, std::string>& constants );

void processIncludeElement( TiXmlElement* element , const std::map<std::string, std::string>& constants , TiXmlDocument &document);

void processConstants( TiXmlNode* node , std::map<std::string, std::string>& constants ) ;
void processConstant( TiXmlElement* element , std::map<std::string, std::string>& constants ) ;

std::string &performConstantReplacement( std::string& value, const std::map<std::string, std::string>& constants ) ;

mutable StringParametersMap _map{};
StringParameters* _current ;
Expand Down
3 changes: 2 additions & 1 deletion source/src/Marlin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ int main(int argc, char** argv ){
// save dynamic options into map
cmdlineparams[ cmdlinekey[0] ][ cmdlinekey[1] ] = cmdlinearg[1] ;

cout << "<!-- steering file parameter: [ " << cmdlinekey[0] << "." << cmdlinekey[1] << " ] will be OVERWRITTEN with value: [\"" << cmdlinearg[1] << "\"] -->" << endl;
std::string type = cmdlinekey[0] == "constant" ? "constant" : "parameter" ;
cout << "<!-- steering file " << type << ": [ " << cmdlinekey[0] << "." << cmdlinekey[1] << " ] will be OVERWRITTEN with value: [\"" << cmdlinearg[1] << "\"] -->" << endl;

// erase dynamic options from **argv
for( int j = i ; j < argc-1 ; j++ ){
Expand Down
Loading