Quote more columns

usnistgov · Apr 27, 2021 · 0bf5292 · 0bf5292
1 parent 072386e
commit 0bf5292
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/elft_1_x/validation/VERSION b/elft_1_x/validation/VERSION
@@ -1 +1 @@
-202104271123
+202104271155
diff --git a/elft_1_x/validation/src/elft_validation.cpp b/elft_1_x/validation/src/elft_validation.cpp
@@ -600,7 +600,7 @@ ELFT::Validation::runExtractionExtractData(
 	static const std::string header{"\"template_filename\",elapsed,"
 	    "type,index,num_templates_in_buffer,image_identifier,quality,"
 	    "imp,frct,frgp,orientation,lpm,value_assessment,lsb,pat,plr,trv,"
-	    "cores,deltas,minutia,roi"};
+	    "\"cores\",\"deltas\",\"minutia\",\"roi\""};
 
 	const std::string logName{"extractionData-" +
 	    e2i2s(*args.templateType) + '-' + ts(getpid()) + ".log"};
@@ -928,10 +928,13 @@ ELFT::Validation::performSingleExtractData(
 		logLine += (efs.pat ? e2i2s(*efs.pat) : NA) + ',';
 		logLine += (efs.plr ? ts(*efs.plr) : NA) + ',';
 		logLine += (efs.trv ? ts(*efs.trv) : NA) + ',';
-		logLine += (efs.cores ? splice(*efs.cores) : NA) + ',';
-		logLine += (efs.deltas ? splice(*efs.deltas) : NA) + ',';
-		logLine += (efs.minutiae ? splice(*efs.minutiae) : NA) + ',';
-		logLine += (efs.roi ? splice(*efs.roi) : NA);
+		logLine += (efs.cores ? '"' + splice(*efs.cores) + '"' : NA) +
+		    ',';
+		logLine += (efs.deltas ? '"' + splice(*efs.deltas)  + '"': NA) +
+		    ',';
+		logLine += (efs.minutiae ?
+		    '"' + splice(*efs.minutiae) + '"' : NA) + ',';
+		logLine += (efs.roi ? '"' + splice(*efs.roi)  + '"': NA);
 
 		logLine += '\n';
 	}
@@ -1071,7 +1074,7 @@ ELFT::Validation::performSingleSearch(
 		for (const auto &c : rv.candidateList) {
 			logLine += logLinePrefix + ts(rv.decision) + ',' +
 			    ts(rv.candidateList.size()) + ',' + ts(++rank) +
-			    ',' + c.identifier + ',' + e2i2s(c.frgp) + ',' +
+			    ",\"" + c.identifier + "\"," + e2i2s(c.frgp) + ',' +
 			    ts(c.similarity);
 			if (rank < rv.candidateList.size())
 				logLine += '\n';

diff --git a/elft_1_x/validation/validate b/elft_1_x/validation/validate
@@ -987,7 +987,7 @@ compile()
 	declare -A md5s
 	md5s["../libelft/libelft.cpp"]="f804aba2bed873154a8985d3909e889b"
 	md5s["../include/elft.h"]="78c14f2197a400b86a6ae50411ed1ce2"
-	md5s["src/elft_validation.cpp"]="064f6e7cc54adb1d5df56cf68dc766c3"
+	md5s["src/elft_validation.cpp"]="120fbd5ae282520d86390a4cd8ea27eb"
 	md5s["src/elft_validation.h"]="3fb8805ccb586dc33f93a3b38b24988d"
 	md5s["src/elft_validation_data.h"]="b3ccc363cd4da00c65a2fec21925f873"
 	md5s["src/elft_validation_utils.h"]="c15e6eb6c1505a81721364e65a9ac46d"