[Oval-commits] r95 - trunk/Interpreters/src/probes/independent

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-01 17:46:42 +0000 (Wed, 01 Aug 2007)
New Revision: 95

Modified:
   trunk/Interpreters/src/probes/independent/TextFileContentProbe.cpp
Log:
Fix bug in fields of collected item.

Modified: trunk/Interpreters/src/probes/independent/TextFileContentProbe.cpp
===================================================================
--- trunk/Interpreters/src/probes/independent/TextFileContentProbe.cpp	2007-07-19 19:40:39 UTC (rev 94)
+++ trunk/Interpreters/src/probes/independent/TextFileContentProbe.cpp	2007-08-01 17:46:42 UTC (rev 95)
@@ -183,17 +183,14 @@
 				StringVector::iterator iterator;
 				for (iterator = results->begin(); iterator != results->end(); iterator++) 
 				{
-					Log::Debug ("Good string: " + (*iterator));
 					item = this->CreateItem();
 					item->SetStatus(OvalEnum::STATUS_EXISTS);
 					item->AppendElement(new ItemEntity("path", path, OvalEnum::DATATYPE_STRING, true, OvalEnum::STATUS_EXISTS));
 					item->AppendElement(new ItemEntity("filename", fileName, OvalEnum::DATATYPE_STRING, true, OvalEnum::STATUS_EXISTS));
-					item->AppendElement(new ItemEntity("line", line->GetValue(), OvalEnum::DATATYPE_STRING, true, OvalEnum::STATUS_EXISTS));
-					item->AppendElement(new ItemEntity("value_of", (*iterator), OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_EXISTS));
+					item->AppendElement(new ItemEntity("subexpression", line->GetValue(), OvalEnum::DATATYPE_STRING, true, OvalEnum::STATUS_EXISTS));
+					item->AppendElement(new ItemEntity("line", (*iterator), OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_EXISTS));
 				}
-			} else {
-				Log::Debug ("Bad string: " + buffer);
-			}
+			} 
 		}
 		infile.close();
 	}
@@ -205,42 +202,22 @@
 	bool retVal = false;
 	string pattern = line->GetValue();
 
-	switch (line->GetOperation()) {
+	if (line->GetOperation() == OvalEnum::OPERATION_EQUALS) {
+		if (this->IsMatch (pattern, lineFromFile, false) ) {
+			substrings->push_back (lineFromFile);
+			retVal = true;
+		}
+	} else if (line->GetOperation() == OvalEnum::OPERATION_NOT_EQUAL) {
+		if (not this->IsMatch (pattern, lineFromFile, false) ) {
+			substrings->push_back (lineFromFile);
+			retVal = true;
+		}
+	} else if (line->GetOperation() == OvalEnum::OPERATION_PATTERN_MATCH) {
+		if (this->IsMatch (pattern, lineFromFile, true) ) {
+			substrings->push_back (lineFromFile);
+			retVal = true;
+		}
+}
 
-		case OvalEnum::OPERATION_EQUALS:
-			Log::Debug ("Test equals of " + lineFromFile + " and " + pattern);
-			if (this->IsMatch (pattern, lineFromFile, false) )
-			{
-				substrings->push_back (lineFromFile);
-				retVal = true;
-			}
-			break;
-
-		case OvalEnum::OPERATION_NOT_EQUAL:
-			Log::Debug ("Test not equal of " + lineFromFile + " and " + pattern);
-			if (not this->IsMatch (pattern, lineFromFile, false) )
-			{
-				substrings->push_back (lineFromFile);
-				retVal = true;
-			}
-			break;
-
-		case OvalEnum::OPERATION_PATTERN_MATCH:
-			Log::Debug ("Test pattern match of " + lineFromFile + " and " + pattern);
-			if (this->IsMatch (pattern, lineFromFile, true) )
-			{
-				Log::Debug ("Pass");
-				substrings->push_back (lineFromFile);
-				retVal = true;
-			} else {
-				Log::Debug ("Miss");
-				Log::Debug ("Line " + lineFromFile); Log::Debug (" not match to " + pattern);
-			}
-			break;
-
-		default:
-			retVal = false;
-	}
-
 	return retVal;
 }