diff --git a/src/basics/basics/utilities/UbFileInputASCII.cpp b/src/basics/basics/utilities/UbFileInputASCII.cpp index f988c52f7e381b988830a4506c72e77221c177d9..63adb21cccad2b7285d516d35d70df8afa654db2 100644 --- a/src/basics/basics/utilities/UbFileInputASCII.cpp +++ b/src/basics/basics/utilities/UbFileInputASCII.cpp @@ -180,9 +180,11 @@ int UbFileInputASCII::readIntegerAfterString(const string &var) infile.seekg(0L, ios::beg); // Positionszeiger der Datei auf den Anfang setzen char line[512]; - + int counter = 0; do { infile.getline(line, 512); + printf("%d: %s\n", counter, line); + counter++; if (infile.eof()) UB_THROW(UbException(UB_EXARGS, "error at reading in file \"" + filename + "\" -> " + var + " wasn't found in " + this->filename)); @@ -236,7 +238,6 @@ string UbFileInputASCII::readStringAfterString(const string &var) //,char *value char line[512]; // string line_copy[512]; - do { infile.getline(line, 512); if (infile.eof()) @@ -244,6 +245,17 @@ string UbFileInputASCII::readStringAfterString(const string &var) //,char *value " wasn't found in " + this->filename)); } while (strstr(line, var.c_str()) != line); // Ende Schleife, wenn varname ganz in zeile vorkommt + // std::string lineRead; + // while(getline(infile, lineRead)) + // { + // if(lineRead.find(toSearch, 0) < lineRead.length()) + // { + // occurenceNumber++; + // cout << counter << ":" << lineRead << endl; + + // } + // } + std::string temp{ line }; temp = temp.substr(var.size()); // zeile um "varname" kuerzen diff --git a/src/basics/basics/utilities/UbFileInputASCIITest.cpp b/src/basics/basics/utilities/UbFileInputASCIITest.cpp index bd16c142be4363bc0fab9099199f039bd351175e..87cb5ce58eb359239d3c3e29babf04e600edc64c 100644 --- a/src/basics/basics/utilities/UbFileInputASCIITest.cpp +++ b/src/basics/basics/utilities/UbFileInputASCIITest.cpp @@ -12,7 +12,7 @@ TEST(UbFileInputASCIITest, readIntegerAfterString) UbFileInputASCII sut {filePath.string()}; - // const int actual = sut.readIntegerAfterString("test ="); + const int actual = sut.readIntegerAfterString("test ="); - // EXPECT_THAT(actual, testing::Eq(1)); + EXPECT_THAT(actual, testing::Eq(1)); }