Fix handling of file epoch for static datums

rogerfraser · rogerfraser · commit a354b67282f8 · 2025-08-12T15:53:41.000+10:00
diff --git a/dynadjust/dynadjust/dnaimportwrapper/dnaimportwrapper.cpp b/dynadjust/dynadjust/dnaimportwrapper/dnaimportwrapper.cpp
@@ -1148,10 +1148,13 @@ int ImportDataFiles(dna_import& parserDynaML, vdnaStnPtr* vStations, vdnaMsrPtr*
 					std::stringstream epochSource;
 					if (isStaticFrame)
 					{
-						epochSource << "  - Warning: File epoch (" << inputFileEpoch << ") differs from project epoch (" << p.i.epoch << ")." << std::endl;
-						if (!p.g.quiet)
-							std::cout << epochSource.str();
-						*imp_file << epochSource.str();
+                        if (!boost::iequals(p.i.epoch, inputFileEpoch)) 
+						{
+                            epochSource << "  - Warning: File epoch (" << inputFileEpoch
+                                        << ") differs from project epoch (" << p.i.epoch << ")." << std::endl;
+                            if (!p.g.quiet) std::cout << epochSource.str();
+                            *imp_file << epochSource.str();
+                        }
 					}
 					else
 					{

Original file line number	Diff line number	Diff line change
`@@ -1148,10 +1148,13 @@ int ImportDataFiles(dna_import& parserDynaML, vdnaStnPtr* vStations, vdnaMsrPtr*`
`1148`	`1148`	`std::stringstream epochSource;`
`1149`	`1149`	`if (isStaticFrame)`
`1150`	`1150`	`{`
`1151`		`- epochSource << " - Warning: File epoch (" << inputFileEpoch << ") differs from project epoch (" << p.i.epoch << ")." << std::endl;`
`1152`		`- if (!p.g.quiet)`
`1153`		`- std::cout << epochSource.str();`
`1154`		`- *imp_file << epochSource.str();`
	`1151`	`+ if (!boost::iequals(p.i.epoch, inputFileEpoch))`
	`1152`	`+ {`
	`1153`	`+ epochSource << " - Warning: File epoch (" << inputFileEpoch`
	`1154`	`+ << ") differs from project epoch (" << p.i.epoch << ")." << std::endl;`
	`1155`	`+ if (!p.g.quiet) std::cout << epochSource.str();`
	`1156`	`+ *imp_file << epochSource.str();`
	`1157`	`+ }`
`1155`	`1158`	`}`
`1156`	`1159`	`else`
`1157`	`1160`	`{`