You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.7 KiB
51 lines
1.7 KiB
Index: flowscan.in |
|
--- flowscan.in.orig 2001-02-16 22:17:31 +0100 |
|
+++ flowscan.in 2004-12-18 19:11:35 +0100 |
|
@@ -22,13 +22,13 @@ |
|
|
|
require 5.004; # for UNIVERSAL::can method |
|
use FindBin; |
|
+use lib $FindBin::Bin; |
|
use Cflow qw(:flowvars 1.017); |
|
use Benchmark; |
|
use Getopt::Std; |
|
use POSIX; # for strftime |
|
use File::Basename; |
|
use ConfigReader::DirectiveStyle; |
|
-use lib $FindBin::Bin; |
|
use FlowScan; # for mutt_mktime, etc. |
|
|
|
'$Revision: 1.1 $' =~ m/(\d+)\.(\d+)/ && (( $VERSION ) = sprintf("%d.%03d", $1, $2)); |
|
Index: FlowScan.pm |
|
--- FlowScan.pm.orig 2001-02-11 21:41:47 +0100 |
|
+++ FlowScan.pm 2004-12-18 20:01:03 +0100 |
|
@@ -93,7 +93,7 @@ |
|
sub file2time_t { |
|
my $file = shift; |
|
if ($file =~ |
|
- m/(\d\d\d\d)(\d\d)(\d\d)_(\d\d):(\d\d):(\d\d)([+-])(\d\d)(\d\d)/) { |
|
+ m/(\d\d\d\d)-?(\d\d)-?(\d\d)[_.](\d\d):?(\d\d):?(\d\d)([+-])(\d\d)(\d\d)/) { |
|
# The file name contains an "hours east of GMT" component |
|
my(@tm) = ($6, $5, $4, $3, $2-1, $1-1900, 0, 0, -1); |
|
my($tm_sec, $tm_min, $tm_hour, $tm_mday, $tm_mon, $tm_year, |
|
@@ -105,7 +105,7 @@ |
|
} |
|
mutt_normalize_time(@tm); |
|
return mutt_mktime(@tm, -1, 0) |
|
- } elsif ($file =~ m/(\d\d\d\d)(\d\d)(\d\d)_(\d\d):(\d\d):(\d\d)$/) { |
|
+ } elsif ($file =~ m/(\d\d\d\d)-?(\d\d)-?(\d\d)[_.](\d\d):?(\d\d):?(\d\d)$/) { |
|
# The file name contains just the plain old localtime |
|
return mutt_mktime($6, $5, $4, $3, $2-1, $1-1900, 0, 0, -1, 1) |
|
} else { |
|
@@ -157,9 +157,9 @@ |
|
RRA:AVERAGE:0:1:600 |
|
RRA:AVERAGE:0:6:600 |
|
RRA:AVERAGE:0:24:600 |
|
- RRA:AVERAGE:0:288:732 |
|
+ RRA:AVERAGE:0:288:1827 |
|
RRA:MAX:0:24:600 |
|
- RRA:MAX:0:288:732 |
|
+ RRA:MAX:0:288:1827 |
|
) |
|
); |
|
my $err=RRDs::error;
|
|
|