FVDE/ennstatus Changeset - 1caae561a67e · Chaos Computer Club Lëtzebuerg Projects

Changeset - 1caae561a67e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Tyler Durden (virii) - 11 years ago 2014-02-10 21:23:28
virii@c3l.lu

Sloppy traffix fix

1 file changed with 10 insertions and 4 deletions:

Scripts/traffic_statistics.pl

0 comments (0 inline, 0 general)

Scripts/traffic_statistics.pl

➞

Show inline comments

@@ @@ -14,10 +14,14 @@ use Chart::Clicker::Data::Series; @@
 use Chart::Clicker::Renderer::Area;
 use Geometry::Primitive::Rectangle;
 use Graphics::Color::RGB;
 ############### [Which year] ###########################################
 $select_year = 2014;
 $select_year = shift 	if $ARGV[0] =~ /^\d{4}$/;
 ############### [Create new statistics image] ##########################
 $cc = Chart::Clicker->new(width => 1248, height => 800);
 $ds = Chart::Clicker::Data::DataSet->new();
-@months = qw(1 2 3 4 5 6 7 8 9 10 11 12);
+@months = 1..12;
 @series;
 @traffix;
 ########################################################################
@@ @@ -45,7 +49,7 @@ foreach $server_name (@servers) { @@
 	die "[-] '$server_name' Failed!\n" unless $server_response->{success};
 	@xml_content = split(/\n/,$server_response->{content});
 	foreach $xml_line (@xml_content) {
-		if ($xml_line =~ /\<month id="(\d+)"\>\<date\>\<year\>(\d+)\<\/year\>\<month\>(\d+)\<\/month\>\<\/date\>\<rx\>(\d+)\<\/rx\>\<tx\>(\d+)\<\/tx\>\<\/month\>/ig) {
+		if ($xml_line =~ /\<month id="(\d+)"\>\<date\>\<year\>($select_year)\<\/year\>\<month\>(\d+)\<\/month\>\<\/date\>\<rx\>(\d+)\<\/rx\>\<tx\>(\d+)\<\/tx\>\<\/month\>/ig) {
 			($id,$year,$month,$rx,$tx) = ($1,$2,$3,$4,$5,$6);
 			$rxtx = ($tx + $rx) * 10e-10;
 			$traffic = $1 if $rxtx =~ /^(\d+\.?\d{5})/;
@@ @@ -53,7 +57,8 @@ foreach $server_name (@servers) { @@
+		}
+	}
 	for (scalar @traffix..11) {
 		unshift @traffix, 0;
 		push @traffix, 0 	if $select_year == 2014;
 		unshift @traffix, 0 	unless $select_year == 2014;
+	}
 	$ds->add_to_series(Chart::Clicker::Data::Series->new(
@@ @@ -73,10 +78,11 @@ foreach $server_name (@servers) { @@
 $area = Chart::Clicker::Renderer::Area->new(opacity => .2);
 $area->brush->width(3);
 $def->renderer($area);
-$def->range_axis->tick_values([qw(20 40 60 80 100 120 140 160 180 200 220)]);
+$def->range_axis->tick_values([qw(20 40 60 80 100 120 140 160 300)]);
 $def->range_axis->format('%d');
 $def->domain_axis->ticks(11);
 $def->domain_axis->tick_labels([qw(January February Mars April June July August September October November December)]);
 $def->domain_axis->format('%d');
 $cc->write_output('stats.png');

0 comments (0 inline, 0 general)