X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllEntryVerify.cxx;h=641b8f7829c384b4803d8292a7a68c91180a8445;hb=9d461db5c5d954548cd07d1fa095e9bad43a0cac;hp=60c6e9a1dbdb896770ab9e3ae68bafcef84d53e9;hpb=ab62b1a706df8e2ab1fbf26fa5037d6c22293655;p=gdcm.git diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx index 60c6e9a1..641b8f78 100644 --- a/Testing/TestAllEntryVerify.cxx +++ b/Testing/TestAllEntryVerify.cxx @@ -1,128 +1,169 @@ +/*========================================================================= + + Program: gdcm + Module: $RCSfile: TestAllEntryVerify.cxx,v $ + Language: C++ + Date: $Date: 2005/10/18 08:35:45 $ + Version: $Revision: 1.29 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ +#include "gdcmFile.h" + #include #include #include #include -#include "gdcmHeader.h" - -//Generated file: -#include "gdcmDataImages.h" - -using namespace std; +#include -typedef string EntryValueType; // same type as gdcmValEntry::value -typedef map< gdcmTagKey, EntryValueType > MapEntryValues; -typedef MapEntryValues* MapEntryValuesPtr; -typedef string FileNameType; -typedef map< FileNameType, MapEntryValuesPtr > MapFileValuesType; +typedef std::string EntryValueType; // same type as DataEntry::value +typedef std::map< gdcm::TagKey, EntryValueType > MapEntryValues; +typedef MapEntryValues *MapEntryValuesPtr; +typedef std::string FileNameType; +typedef std::map< FileNameType, MapEntryValuesPtr > MapFileValuesType; struct ParserException { - string error; - static string Indent; + std::string error; + static std::string Indent; - static string GetIndent() { return ParserException::Indent; } - ParserException( string ErrorMessage ) + static std::string GetIndent() { return ParserException::Indent; } + ParserException( std::string ErrorMessage ) { error = ErrorMessage; Indent = " "; } - void Print() { cerr << Indent << error << endl; } + void Print() { std::cerr << Indent << error << std::endl; } }; -string ParserException::Indent = " "; +std::string ParserException::Indent = " "; class ReferenceFileParser { - bool AddKeyValuePairToMap( string& key, string& value ); - - istream& eatwhite(istream& is); - void eatwhite(string& toClean); - string ExtractFirstString(string& toSplit); - void CleanUpLine( string& line ); - - string ExtractValue(string& toSplit) throw ( ParserException ); - void ParseRegularLine( string& line ) throw ( ParserException ); - void FirstPassReferenceFile() throw ( ParserException ); - bool SecondPassReferenceFile() throw ( ParserException ); - void HandleFileName( string& line ) throw ( ParserException ); - void HandleKey( string& line ) throw ( ParserException ); - bool HandleValue( string& line ) throw ( ParserException ); - static uint16_t axtoi( char* ); public: ReferenceFileParser(); - bool Open( string& referenceFileName ); + ~ReferenceFileParser(); + + bool Open( std::string &referenceFileName ); void Print(); - void SetDataPath(string&); + void SetDataPath(std::string&); bool Check(); + bool Check( std::string fileName ); + +private: + bool AddKeyValuePairToMap( std::string &key, std::string &value ); + + std::istream &eatwhite(std::istream &is); + void eatwhite(std::string &toClean); + std::string ExtractFirstString(std::string &toSplit); + void CleanUpLine( std::string &line ); + + bool Check( MapFileValuesType::iterator &fileIt ); + std::string ExtractValue(std::string &toSplit) throw ( ParserException ); + void ParseRegularLine( std::string &line ) throw ( ParserException ); + void FirstPassReferenceFile() throw ( ParserException ); + bool SecondPassReferenceFile() throw ( ParserException ); + void HandleFileName( std::string &line ) throw ( ParserException ); + void HandleKey( std::string &line ) throw ( ParserException ); + bool HandleValue( std::string &line ) throw ( ParserException ); + static uint16_t axtoi( char* ); + private: /// The directory containing the images to check: - string DataPath; + std::string DataPath; /// The product of the parser: MapFileValuesType ProducedMap; /// The ifstream attached to the file we parse: - ifstream from; + std::ifstream from; /// String prefixing every output - string Indent; + std::string Indent; /// The current line position within the stream: int lineNumber; /// The currently parsed filename: - string CurrentFileName; + std::string CurrentFileName; /// The currently parsed key: - string CurrentKey; + std::string CurrentKey; /// The currently parsed value: - string CurrentValue; + std::string CurrentValue; /// The current MapEntryValues pointer: - MapEntryValues* CurrentMapEntryValuesPtr; + MapEntryValues *CurrentMapEntryValuesPtr; }; -/// As gotten from: +ReferenceFileParser::ReferenceFileParser() +{ + lineNumber = 1; + Indent = " "; +} + +ReferenceFileParser::~ReferenceFileParser() +{ + for (MapFileValuesType::iterator i = ProducedMap.begin(); + i != ProducedMap.end(); + ++i) + { + delete i->second; + } +} + +/// As got from: /// http://community.borland.com/article/0,1410,17203,0.html -uint16_t ReferenceFileParser::axtoi(char *hexStg) { - int n = 0; // position in string - int m = 0; // position in digit[] to shift - int count; // loop index - int intValue = 0; // integer value of hex string - int digit[5]; // hold values to convert - while (n < 4) { - if (hexStg[n]=='\0') - break; - if (hexStg[n] > 0x29 && hexStg[n] < 0x40 ) //if 0 to 9 - digit[n] = hexStg[n] & 0x0f; //convert to int - else if (hexStg[n] >='a' && hexStg[n] <= 'f') //if a to f - digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int - else if (hexStg[n] >='A' && hexStg[n] <= 'F') //if A to F - digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int - else break; - n++; - } - count = n; - m = n - 1; - n = 0; - while(n < count) { - // digit[n] is value of hex digit at position n - // (m << 2) is the number of positions to shift - // OR the bits into return value - intValue = intValue | (digit[n] << (m << 2)); - m--; // adjust the position to set - n++; // next digit to process - } - return (intValue); +uint16_t ReferenceFileParser::axtoi(char *hexStg) +{ + int n = 0; // position in string + int m = 0; // position in digit[] to shift + int count; // loop index + int intValue = 0; // integer value of hex string + int digit[5]; // hold values to convert + while (n < 4) + { + if (hexStg[n]=='\0') + break; + if (hexStg[n] > 0x29 && hexStg[n] < 0x40 ) //if 0 to 9 + digit[n] = hexStg[n] & 0x0f; //convert to int + else if (hexStg[n] >='a' && hexStg[n] <= 'f') //if a to f + digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int + else if (hexStg[n] >='A' && hexStg[n] <= 'F') //if A to F + digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int + else break; + n++; + } + count = n; + m = n - 1; + n = 0; + while(n < count) + { + // digit[n] is value of hex digit at position n + // (m << 2) is the number of positions to shift + // OR the bits into return value + intValue = intValue | (digit[n] << (m << 2)); + m--; // adjust the position to set + n++; // next digit to process + } + return (uint16_t)intValue; } -void ReferenceFileParser::SetDataPath( string& inDataPath ) +void ReferenceFileParser::SetDataPath( std::string &inDataPath ) { DataPath = inDataPath; } -bool ReferenceFileParser::AddKeyValuePairToMap( string& key, string& value ) +bool ReferenceFileParser::AddKeyValuePairToMap( std::string &key, + std::string &value ) { if ( !CurrentMapEntryValuesPtr ) return false; @@ -137,78 +178,107 @@ void ReferenceFileParser::Print() { for (MapFileValuesType::iterator i = ProducedMap.begin(); i != ProducedMap.end(); - ++i) + ++i) { - cout << Indent << "FileName: " << i->first << endl; + std::cout << Indent << "FileName: " << i->first << std::endl; MapEntryValuesPtr KeyValues = i->second; for (MapEntryValues::iterator j = KeyValues->begin(); j != KeyValues->end(); - ++j) + ++j) { - cout << Indent - << " Key: " << j->first + std::cout << Indent + << " Key: " << j->first << " Value: " << j->second - << endl; + << std::endl; } - cout << Indent << endl; + std::cout << Indent << std::endl; } - cout << Indent << endl; + std::cout << Indent << std::endl; } bool ReferenceFileParser::Check() { + bool ret = true; for (MapFileValuesType::iterator i = ProducedMap.begin(); i != ProducedMap.end(); - ++i) + ++i) { - string fileName = DataPath + i->first; - cout << Indent << "FileName: " << fileName << endl; - gdcmHeader* tested = new gdcmHeader( fileName.c_str() ); - if( !tested->IsReadable() ) - { - cerr << Indent << "Image not gdcm compatible:" - << fileName << endl; - delete tested; - return false; - } + ret &= Check(i); + } + std::cout << Indent << std::endl; + return ret; +} - MapEntryValuesPtr KeyValues = i->second; - for (MapEntryValues::iterator j = KeyValues->begin(); - j != KeyValues->end(); - ++j) - { - string key = j->first; +bool ReferenceFileParser::Check( std::string fileName ) +{ + MapFileValuesType::iterator it = ProducedMap.find(fileName); + if( it != ProducedMap.end() ) + { + return Check(it); + } + std::cerr << Indent << "Failed\n" + << Indent << "Image not found :" + << fileName << std::endl; + return false; +} - string groupString = key.substr( 0, 4 ); - char* groupCharPtr; - groupCharPtr = new char(groupString.length() + 1); - strcpy( groupCharPtr, groupString.c_str() ); +bool ReferenceFileParser::Check( MapFileValuesType::iterator &fileIt ) +{ + std::string fileName = DataPath + fileIt->first; + std::cout << Indent << "FileName: " << fileName << std::endl; + + gdcm::File *tested; + tested = new gdcm::File( ); + tested->SetFileName( fileName.c_str() ); + tested->Load( ); + if( !tested->IsReadable() ) + { + std::cerr << Indent << "Failed\n" + << Indent << "Image not gdcm compatible:" + << fileName << std::endl; + delete tested; + return false; + } + + MapEntryValuesPtr KeyValues = fileIt->second; + for (MapEntryValues::iterator j = KeyValues->begin(); + j != KeyValues->end(); + ++j) + { + std::string key = j->first; - string groupElement = key.substr( key.find_first_of( "|" ) + 1, 4 ); - char* groupElementPtr; - groupElementPtr = new char(groupElement.length() + 1); - strcpy( groupElementPtr, groupElement.c_str() ); + std::string groupString = key.substr( 0, 4 ); + std::string groupElement = key.substr( key.find_first_of( "|" ) + 1, 4 ); - uint16_t group = axtoi( groupCharPtr ); - uint16_t element = axtoi( groupElementPtr ); + uint16_t group = axtoi( &(groupString[0]) ); + uint16_t element = axtoi( &(groupElement[0]) ); - string testedValue = tested->GetEntryByNumber(group, element); - if ( testedValue != j->second ) + std::string testedValue = tested->GetEntryValue(group, element); + if ( testedValue != j->second ) + { + // Oops make sure this is only the \0 that differ + if( testedValue[j->second.size()] != '\0' || + strncmp(testedValue.c_str(), + j->second.c_str(), j->second.size()) != 0) { - cout << Indent << "Uncorrect value for key " << key << endl - << Indent << " read value " << testedValue << endl - << Indent << " reference value " << j->second << endl; + std::cout << Indent << "Failed\n" + << Indent << "Uncorrect value for key " + << key << std::endl + << Indent << " read value [" + << testedValue << "]" << std::endl + << Indent << " reference value [" + << j->second << "]" << std::endl; return false; } } - delete tested; - cout << Indent << " OK" << endl; } - cout << Indent << endl; + delete tested; + std::cout << Indent << " OK" << std::endl; + return true; } -istream& ReferenceFileParser::eatwhite( istream& is ) +std::istream &ReferenceFileParser::eatwhite( std::istream &is ) { char c; while (is.get(c)) { @@ -220,17 +290,17 @@ istream& ReferenceFileParser::eatwhite( istream& is ) return is; } -void ReferenceFileParser::eatwhite( string& toClean ) +void ReferenceFileParser::eatwhite( std::string &toClean ) { while( toClean.find_first_of( " " ) == 0 ) toClean.erase( 0, toClean.find_first_of( " " ) + 1 ); } -string ReferenceFileParser::ExtractFirstString( string& toSplit ) +std::string ReferenceFileParser::ExtractFirstString( std::string &toSplit ) { std::string firstString; eatwhite( toSplit ); - if ( toSplit.find( " " ) == string::npos ) { + if ( toSplit.find( " " ) == std::string::npos ) { firstString = toSplit; toSplit.erase(); return firstString; @@ -241,30 +311,32 @@ string ReferenceFileParser::ExtractFirstString( string& toSplit ) return firstString; } -string ReferenceFileParser::ExtractValue( string& toSplit ) +std::string ReferenceFileParser::ExtractValue( std::string &toSplit ) throw ( ParserException ) { eatwhite( toSplit ); - string::size_type beginPos = toSplit.find_first_of( '"' ); - string::size_type endPos = toSplit.find_last_of( '"' ); - - // Make sure we have at most to " in toSplit: - string noQuotes = toSplit.substr( beginPos + 1, endPos - beginPos - 1); - if ( noQuotes.find_first_of( '"' ) != string::npos ) + std::string::size_type beginPos = toSplit.find_first_of( '"' ); + std::string::size_type endPos = toSplit.find_last_of( '"' ); + + // Make sure we have at most two " in toSplit: + //std::string noQuotes = toSplit.substr( beginPos + 1, endPos - beginPos - 1); + //if ( noQuotes.find_first_of( '"' ) != std::string::npos ) + // throw ParserException( "more than two quote character" ); + if ( toSplit.find_first_of( '"',beginPos+1 ) != endPos ) throw ParserException( "more than two quote character" ); // No leading quote means this is not a value: - if ( beginPos == string::npos ) + if ( beginPos == std::string::npos ) { - return string(); + return std::string(); } - if ( ( endPos == string::npos ) || ( beginPos == endPos ) ) + if ( ( endPos == std::string::npos ) || ( beginPos == endPos ) ) throw ParserException( "unmatched \" (quote character)" ); if ( beginPos != 0 ) { - ostringstream error; + std::ostringstream error; error << "leading character [" << toSplit.substr(beginPos -1, 1) << "] before opening \" "; @@ -276,14 +348,14 @@ string ReferenceFileParser::ExtractValue( string& toSplit ) if ( ( endPos != toSplit.length() - 1 ) && ( toSplit.substr(endPos + 1, 1) != " " ) ) { - ostringstream error; + std::ostringstream error; error << "trailing character [" << toSplit.substr(endPos + 1, 1) << "] after value closing \" "; throw ParserException( error.str() ); } - string value = toSplit.substr( beginPos + 1, endPos - beginPos - 1 ); + std::string value = toSplit.substr( beginPos + 1, endPos - beginPos - 1 ); toSplit.erase( beginPos, endPos - beginPos + 1); eatwhite( toSplit ); return value; @@ -299,14 +371,14 @@ string ReferenceFileParser::ExtractValue( string& toSplit ) /// \warning The underlying file pointer is not preseved. void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException ) { - string line; + std::string line; lineNumber = 1; bool inBlock = false; - from.seekg( 0, ios::beg ); + from.seekg( 0, std::ios::beg ); while ( ! from.eof() ) { - getline( from, line ); + std::getline( from, line ); /// This is how we usually end the parsing because we hit EOF: if ( ! from.good() ) @@ -318,7 +390,7 @@ void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException ) } // Don't try to parse comments (weed out anything after first "#"): - if ( line.find_first_of( "#" ) != string::npos ) + if ( line.find_first_of( "#" ) != std::string::npos ) { line.erase( line.find_first_of( "#" ) ); } @@ -327,11 +399,11 @@ void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException ) // blocks which is illegal: if ( line.find_first_of( "[" ) != line.find_last_of( "[" ) ) { - ostringstream error; + std::ostringstream error; error << "Syntax error: nested block (open) in reference file" - << endl + << std::endl << ParserException::GetIndent() - << " at line " << lineNumber << endl; + << " at line " << lineNumber << std::endl; throw ParserException( error.str() ); } @@ -339,32 +411,32 @@ void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException ) // blocks which is illegal: if ( line.find_first_of( "]" ) != line.find_last_of( "]" ) ) { - ostringstream error; + std::ostringstream error; error << "Syntax error: nested block (close) in reference file" - << endl + << std::endl << ParserException::GetIndent() - << " at line " << lineNumber << endl; + << " at line " << lineNumber << std::endl; throw ParserException( error.str() ); } - bool beginBlock ( line.find_first_of("[") != string::npos ); - bool endBlock ( line.find_last_of("]") != string::npos ); + bool beginBlock ( line.find_first_of("[") != std::string::npos ); + bool endBlock ( line.find_last_of("]") != std::string::npos ); // Opening and closing of block on same line: if ( beginBlock && endBlock ) { - ostringstream error; + std::ostringstream error; error << "Syntax error: opening and closing on block on same line " - << lineNumber++ << endl; + << lineNumber++ << std::endl; throw ParserException( error.str() ); } // Illegal closing block when block not open: if ( !inBlock && endBlock ) { - ostringstream error; + std::ostringstream error; error << "Syntax error: unexpected end of block at line " - << lineNumber++ << endl; + << lineNumber++ << std::endl; throw ParserException( error.str() ); } @@ -376,9 +448,9 @@ void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException ) if ( inBlock && beginBlock ) { - ostringstream error; + std::ostringstream error; error << " Syntax error: illegal opening of nested block at line " - << lineNumber++ << endl; + << lineNumber++ << std::endl; throw ParserException( error.str() ); } @@ -403,21 +475,15 @@ void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException ) // We need rewinding: from.clear(); - from.seekg( 0, ios::beg ); + from.seekg( 0, std::ios::beg ); } -ReferenceFileParser::ReferenceFileParser() +bool ReferenceFileParser::Open( std::string &referenceFileName ) { - lineNumber = 1; - Indent = " "; -} - -bool ReferenceFileParser::Open( string& referenceFileName ) -{ - from.open( referenceFileName.c_str(), ios::in ); + from.open( referenceFileName.c_str(), std::ios::in ); if ( !from.is_open() ) { - cerr << Indent << "Can't open reference file." << endl; + std::cerr << Indent << "Can't open reference file." << std::endl; } try @@ -435,21 +501,21 @@ bool ReferenceFileParser::Open( string& referenceFileName ) return true; //?? } -void ReferenceFileParser::CleanUpLine( string& line ) +void ReferenceFileParser::CleanUpLine( std::string &line ) { // Cleanup from comments: - if ( line.find_first_of( "#" ) != string::npos ) + if ( line.find_first_of( "#" ) != std::string::npos ) line.erase( line.find_first_of( "#" ) ); // Cleanup everything after end block delimiter: - if ( line.find_last_of( "]" ) != string::npos ) + if ( line.find_last_of( "]" ) != std::string::npos ) line.erase( line.find_last_of( "]" ) + 1 ); - // Cleanup leanding whites and skip empty lines: + // Cleanup leading whites and skip empty lines: eatwhite( line ); } -void ReferenceFileParser::HandleFileName( string& line ) +void ReferenceFileParser::HandleFileName( std::string &line ) throw ( ParserException ) { if ( line.length() == 0 ) @@ -461,22 +527,22 @@ void ReferenceFileParser::HandleFileName( string& line ) CurrentFileName = ExtractFirstString(line); } -void ReferenceFileParser::HandleKey( string& line ) +void ReferenceFileParser::HandleKey( std::string &line ) throw ( ParserException ) { if ( CurrentKey.length() != 0 ) return; CurrentKey = ExtractFirstString(line); - if ( CurrentKey.find_first_of( "|" ) == string::npos ) + if ( CurrentKey.find_first_of( "|" ) == std::string::npos ) { - ostringstream error; + std::ostringstream error; error << "uncorrect key:" << CurrentKey; throw ParserException( error.str() ); } } -bool ReferenceFileParser::HandleValue( string& line ) +bool ReferenceFileParser::HandleValue( std::string &line ) throw ( ParserException ) { if ( line.length() == 0 ) @@ -484,23 +550,22 @@ bool ReferenceFileParser::HandleValue( string& line ) if ( CurrentKey.length() == 0 ) { - cout << Indent << "No key present:" << CurrentKey << endl; + std::cout << Indent << "No key present:" << CurrentKey << std::endl; return false; } - string newCurrentValue = ExtractValue(line); + std::string newCurrentValue = ExtractValue(line); if ( newCurrentValue.length() == 0 ) { - ostringstream error; - error << "missing value for key:" << CurrentKey; - throw ParserException( error.str() ); + std::cout << Indent << "Warning: empty value for key:" + << CurrentKey << std::endl; } CurrentValue += newCurrentValue; return true; } -void ReferenceFileParser::ParseRegularLine(string& line) +void ReferenceFileParser::ParseRegularLine( std::string &line) throw ( ParserException ) { if ( line.length() == 0 ) @@ -534,15 +599,15 @@ void ReferenceFileParser::ParseRegularLine(string& line) bool ReferenceFileParser::SecondPassReferenceFile() throw ( ParserException ) { - gdcmTagKey key; + gdcm::TagKey key; EntryValueType value; - string line; + std::string line; bool inBlock = false; lineNumber = 0; while ( !from.eof() ) { - getline( from, line ); + std::getline( from, line ); lineNumber++; CleanUpLine( line ); @@ -551,8 +616,8 @@ bool ReferenceFileParser::SecondPassReferenceFile() if ( line.length() == 0 ) continue; - bool beginBlock ( line.find_first_of("[") != string::npos ); - bool endBlock ( line.find_last_of("]") != string::npos ); + bool beginBlock ( line.find_first_of("[") != std::string::npos ); + bool endBlock ( line.find_last_of("]") != std::string::npos ); // Waiting for a block to be opened. Meanwhile, drop everything: if ( !inBlock && !beginBlock ) @@ -584,35 +649,55 @@ bool ReferenceFileParser::SecondPassReferenceFile() return true; //?? } -int TestAllEntryVerify(int argc, char* argv[]) +int TestAllEntryVerify(int argc, char *argv[]) { - if ( argc > 1 ) + if ( argc > 2 ) { - cerr << " Usage: " << argv[0] - << " (no arguments needed)." << endl; + std::cerr << " Usage: " << argv[0] + << " fileName" << std::endl; return 1; } - - cout << " Description (Test::TestAllEntryVerify): " - << endl; - cout << " For all images in gdcmData (and not blacklisted in " - "Test/CMakeLists.txt)" - << endl; - cout << " apply the following to each filename.xxx: " - << endl; - cout << " step 1: parse the image (as gdcmHeader) and call" - << " IsReadable(). " - << endl; - - string referenceDir = GDCM_DATA_ROOT; + + std::string referenceDir = GDCM_DATA_ROOT; referenceDir += "/"; - string referenceFilename = referenceDir + "TestAllEntryVerifyReference.txt"; + std::string referenceFilename = referenceDir + "TestAllEntryVerifyReference.txt"; + + std::cout << " Description (Test::TestAllEntryVerify): " + << std::endl; + std::cout << " For all images (not blacklisted in gdcm/Test/CMakeLists.txt)" + << std::endl; + std::cout << " encountered in directory: " << GDCM_DATA_ROOT << std::endl; + std::cout << " apply the following tests : "<< std::endl; + std::cout << " step 1: parse the image and call IsReadable(). " << std::endl; + std::cout << " step 2: look for the entry corresponding to the image" << std::endl; + std::cout << " in the reference file: \n" + << " " << referenceFilename << std::endl; + std::cout << " step 3: check that each reference tag value listed for this" + << std::endl; + std::cout << " entry matches the tag encountered at parsing step 1." + << std::endl << std::endl; ReferenceFileParser Parser; - Parser.Open(referenceFilename); + if ( !Parser.Open(referenceFilename) ) + { + std::cout << " failed" + << " Corrupted reference file name: " + << referenceFilename << std::endl; + return 1; + } Parser.SetDataPath(referenceDir); // Parser.Print(); - if ( Parser.Check() ) - return 0; - return 1; + std::cout << "Reference file loaded -->\n" + << "Check files : \n"; + + int ret; + if ( argc >= 2 ) + { + ret = Parser.Check( argv[1] ); + } + else + { + ret = Parser.Check(); + } + return !ret; }