mirror of
https://github.com/zeek/zeek.git
synced 2025-10-04 23:58:20 +00:00
Fixing pack_scale and time-as-int.
Also removing now unneccessary canonifier script, and updating test baselines.
This commit is contained in:
parent
00b592f933
commit
fabe891d4f
8 changed files with 144 additions and 151 deletions
|
@ -194,13 +194,12 @@ std::string DataSeries::GetDSOptionsForType(const threading::Field *field)
|
|||
case TYPE_INTERVAL:
|
||||
{
|
||||
std::string s;
|
||||
s += "pack_relative=\"" + std::string(field->name) + "\" ";
|
||||
s += "print_format=\"%.6f\" ";
|
||||
s += "pack_relative=\"" + std::string(field->name) + "\"";
|
||||
|
||||
if ( ! ds_use_integer_for_time )
|
||||
s += "pack_scale=\"1000\" pack_scale_warn=\"no\"";
|
||||
s += " pack_scale=\"1e-6\" print_format=\"%.6f\" pack_scale_warn=\"no\"";
|
||||
else
|
||||
s += string("units=\"") + TIME_UNIT() + "\" epoch=\"unix\"";
|
||||
s += string(" units=\"") + TIME_UNIT() + "\" epoch=\"unix\"";
|
||||
|
||||
return s;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue