[freeside-commits] freeside/httemplate/search 477partVI_census.html, 1.2.2.2, 1.2.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv10289

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	477partVI_census.html 
Log Message:
fix 477 censustract links, add links for states, RT#13922

Index: 477partVI_census.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partVI_census.html,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -w -d -r1.2.2.2 -r1.2.2.3
--- 477partVI_census.html	17 Aug 2011 21:07:56 -0000	1.2.2.2
+++ 477partVI_census.html	17 Aug 2011 21:39:24 -0000	1.2.2.3
@@ -1,13 +1,6 @@
 <% include( 'elements/search.html',
                   'html_init'     => $html_init,
-                  'html_foot'     => sub { if (scalar(keys %state_hash) > 1) {
-                                             '<BR><B>'.
-                                               'WARNING: multiple states found'.
-                                             '</B><BR>';
-                                           } else { 
-                                             '';
-                                           }
-                                         },
+                  'html_foot'     => $html_foot,,
                   'name'          => 'regions',
                   'query'         => [ @sql_query ],
                   'count_query'   =>  $count_query,
@@ -37,14 +30,16 @@
                                      ],
                   'fields'        => [
                     sub { my $row = shift; 
-                          $state_hash{substr($row->censustract, 0, 2)} = 1;
-                          substr($row->censustract, 2, 3)
+                          $state_hash{substr($row->censustract, 0, 2)}++;
+                          substr($row->censustract, 2, 3) || 'none'
+                        },
+                    sub { my $row = shift;
+                          substr($row->censustract, 5) || 'none'
                         },
-                    sub { my $row = shift; substr($row->censustract, 5) },
                     'upload',
                     'download',
                     'technology_code',
-                    sub { $cgi->param('_type') eq 'xml' ? '0' : '' },  # doesn't really work
+                    sub { $cgi->param('_type') eq 'xml' ? '0' : '' },#broken
                     'quantity',
                     sub { my $row = shift; sprintf "%.2f", $row->residential },
                   ],
@@ -134,8 +129,8 @@
                                       map { my $key = $_;
                                             my @values = ref($search_hash{$_}) 
                                               ? @{ $search_hash{$_} }
-                                              : $search_hash{$_}
-                                            map { "$key=$_" } @values
+                                              : $search_hash{$_};
+                                            map { "$key=$_" } @values;
                                           }
                                           keys %search_hash        
                                 ). ';';
@@ -148,4 +143,23 @@
                           if @column_option[$row->download - 1];
                         $result;
                       };
+
+my $html_foot = sub {
+  if (scalar(keys %state_hash) > 1) {
+    '<BR><B>WARNING: multiple states found</B><BR>'.
+    '<TABLE BORDER=0>'. #nicer formatting someday
+    join('', map { '<TR>'.
+                     "<TD>$_</TD>".
+                     qq(<TD><A HREF="${link}state=$_">).
+                       $state_hash{$_}. '</A></TD>'.
+                   '</TR>';
+                 }
+                 keys %state_hash
+        ).
+    '</TABLE>';
+  } else { 
+    '';
+  }
+};
+
 </%init>