Changeset 613

Timestamp:

03/10/07 19:23:04 (6 years ago)

Author:

max

Message:

Consolidate region names on graph

Files:

• util/server_daily_maint (modified) (5 diffs)

util/server_daily_maint

@@ -637 +637 @@
 sub gather_region_data
 {
-    my ($when, $startwhen, $endwhen) = @_;
+    my ($when, $startwhen, $endwhen, $long_ids) = @_;
         
-    my %regions = ( 94 => 'Melbourne', 73 => 'Sydney', 101 => 'Perth',
-                    81 => 'Adelaide', 75 => 'Brisbane', 126 => 'ACT',
-                    79 => 'QLD', 93 => 'Geelong', 88 => 'Tasmania',
-                    78 => 'Gold Coast', 71 => 'NSW'
-                );
+    my %short_regions = (
+        126 => "ACT", 73 => "Sydney", 184 => "NSW", 66 => "NSW", 
+        67 => "NSW", 63 => "NSW", 69 => "NSW",  71 => "NSW",
+        106 => "NSW", 74 => "Darwin", 108 => "NT", 75 => "Brisbane",
+        78 => "QLD", 79 => "QLD", 114 => "QLD", 81 => "Adelaide",
+        82 => "SA", 83 => "SA", 85 => "SA", 86 => "SA", 107 => "SA",
+        88 => "Tasmania", 94 => "Melbourne", 93 => "VIC",
+        90 => "VIC", 95 => "VIC", 98 => "VIC", 101 => "Perth",
+        102 => "WA" );
+    my %long_regions = (
+       126 => "ACT", 73 => "Sydney", 184 => "Newcastle",
+        66 => "Central Coast NSW", 67 => "Griffith", 63 => "Broken Hill",
+        69 => "Northern NSW", 71 => "Southern NSW", 106 => "NSW Remote",
+        74 => "Darwin", 108 => "NT Remote", 75 => "Brisbane",
+        78 => "Gold Coast", 79 => "QLD Regional", 114 => "QLD Remote",
+        81 => "Adelaide", 82 => "Renmark", 83 => "Riverland", 
+        85 => "South East SA", 86 => "Spencer Gulf", 
+        107 => "SA Remote", 88 => "Tasmania", 94 => "Melbourne",
+        93 => "Geelong", 90 => "Eastern VIC", 95 => "Mildura/Sunraysia",
+        98 => "Western VIC", 101 => "Perth", 102 => "WA: Regional");
+
     my $data;
     for (my $i = $startwhen; $i < $endwhen; $i++) 
@@ -652 +668 @@
             foreach my $k (keys %$h)
             {
-                my $label = $regions{$k};
-                $label ||= "region $k";
+                my $label = ($long_ids ? $long_regions{$k} : $short_regions{$k});
                 foreach my $sysid (keys %{$h->{$k}})
                 {
@@ -672 +687 @@
 sub graph_regions
 {
-        my ($when, $startwhen, $endwhen, $title, $rdata) = @_;
+        my ($when, $startwhen, $endwhen, $title) = @_;
 
         my $gname = "region_list_".$when."_".$startwhen."_".$endwhen;
 
-        $rdata = &gather_region_data($when, $startwhen, $endwhen) unless ($rdata);
+        my $rdata = &gather_region_data($when, $startwhen, $endwhen, 0);
         return unless ($rdata);
 
@@ -1063 +1078 @@
 
         @graphs = ( );
-        my $rdata = &gather_region_data("per_day", 0, 7);
+        my $rdata = &gather_region_data("per_day", 0, 7, 1);
         my @regions = ();
         my $top = 10; # list top 5
@@ -1073 +1088 @@
         }
         $template->param('REGIONS', \@regions);
-        push @graphs, { GRAPH => graph_regions("per_day", 0, 7, "Last week", $rdata) };
+        push @graphs, { GRAPH => graph_regions("per_day", 0, 7, "Last week") };
         push @graphs, { GRAPH => graph_regions("per_month", 0, 6, "Last 6 months") };
         $template->param('GRAPHS_REGION', \@graphs);