> Any chance you can post this as an attachment and/or put it up on a
> website -- it is possible gmail garbled the patch:
>
> # patch -p0 --dry-run < Smokeping.pm.patch
> patching file Smokeping.pm
> Hunk #1 FAILED at 939.
> Hunk #2 FAILED at 1065.
> Hunk #3 FAILED at 1341.
> 3 out of 3 hunks FAILED -- saving rejects to file Smokeping.pm.rej
>
Sure ... here goes
tobi
> Thanks,
>
> Bernard
>
>
--
Tobi Oetiker, OETIKER+PARTNER AG, Aarweg 15 CH-4600 Olten
http://it.oetiker.ch [EMAIL PROTECTED] ++41 62 213 9902
Index: lib/Smokeping.pm
===================================================================
--- lib/Smokeping.pm (revision 947)
+++ lib/Smokeping.pm (working copy)
@@ -939,8 +939,10 @@
/^(\d+)$/ && do { my $value = $1; $value = time if $value > 2**32; return $value};
/^\s*(\d{4})-(\d{1,2})-(\d{1,2})(?:\s+(\d{1,2}):(\d{2})(?::(\d{2}))?)?\s*$/ &&
return POSIX::mktime($6||0,$5||0,$4||0,$3,$2-1,$1-1900,0,0,-1);
- /([ -:a-z0-9]+)/ && return $1;
+ /^now$/ && return time;
+ /([ -:a-z0-9]+)/ && return $1;
};
+ return time;
}
sub get_detail ($$$$;$){
@@ -1063,6 +1065,8 @@
$imghref =$cfg->{General}{imgurl}."/__navcache/".$serial;
}
+ $q->param('epoch_start',parse_datetime($q->param('start')));
+ $q->param('epoch_end',parse_datetime($q->param('end')));
@tasks = (["Navigator Graph".$name, parse_datetime($q->param('start')),parse_datetime($q->param('end'))]);
my ($graphret,$xs,$ys) = RRDs::graph
("dummy",
@@ -1337,12 +1341,11 @@
# $page .= qq|<div class="zoom" style="cursor: crosshair;">|;
$page .= qq|<IMG id="zoom" BORDER="0" width="$xs{''}" height="$ys{''}" SRC="${imghref}_${end}_${start}.png">| ;
# $page .= "</div>";
-
- $page .= $q->start_form(-method=>'GET', -id=>'range_form')
- . "<p>Time range: "
- . $q->hidden(-name=>'epoch_start',-id=>'epoch_start',-default=>$start)
+ $page .= $q->start_form(-method=>'POST', -id=>'range_form')
+ . "<p>Time range: "
+ . $q->hidden(-name=>'epoch_start',-id=>'epoch_start')
. $q->hidden(-name=>'hierarchy',-id=>'hierarchy')
- . $q->hidden(-name=>'epoch_end',-id=>'epoch_end',-default=>time())
+ . $q->hidden(-name=>'epoch_end',-id=>'epoch_end')
. $q->hidden(-name=>'target',-id=>'target' )
. $q->hidden(-name=>'displaymode',-default=>$mode )
. $q->textfield(-name=>'start',-default=>$startstr)
Index: CHANGES
===================================================================
--- CHANGES (revision 947)
+++ CHANGES (working copy)
@@ -1,3 +1,6 @@
+* make zooming work properly even for graphs generated with the
+ navigator form time range fields. -- tobi
+
2008/3/10 -- released version 2.3.3
* use separate slave cache and longer slave timeout. this
_______________________________________________
smokeping-users mailing list
[email protected]
https://lists.oetiker.ch/cgi-bin/listinfo/smokeping-users
