[Da-tools-commits] ./debian/userdir-ldap-cgi r100: Remove distribution from summary, add purpose and sponsor

[Peter Palfrader]

------------------------------------------------------------
revno: 100
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap-cgi
timestamp: Tue 2008-07-15 16:34:05 +0200
message:
  Remove distribution from summary, add purpose and sponsor
modified:
  machines.cgi
-------------- next part --------------
=== modified file 'machines.cgi'
--- a/machines.cgi	2008-07-15 14:01:20 +0000
+++ b/machines.cgi	2008-07-15 14:34:05 +0000
@@ -17,7 +17,7 @@
 use MIME::Base64;
 use Digest::MD5 qw(md5_hex);
 
-my (%attrs, @attrorder, %summaryattrs, @summaryorder);
+my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
 
 # This defines the description of the fields, and which fields are retrieved
 %attrs = ('hostname' => 'Host name',
@@ -50,13 +50,14 @@
 
 # ditto for summary
 %summaryattrs = ('hostname' => 'Host name',
-                 'host'     => 'just for a link',
-                 'architecture' => 'Architecture',
-		 'distribution' => 'Distribution',
+		 'host'     => 'just for a link',
+		 'architecture' => 'Architecture',
 		 'status' => 'Status',
-		 'access' => 'Access');
-		 
- at summaryorder = ('hostname', 'architecture', 'distribution', 'status', 'access');		 
+		 'access' => 'Access',
+		 'sponsor' => 'Sponsor',
+		 'purpose' => 'Purpose');
+ at summaryorder = qw{hostname architecture sponsor purpose status access};
+%summarylistitems = map {$_=>1} qw{purpose sponsor};
 
 # Global settings...
 my %config = &Util::ReadConfigFile;
@@ -162,16 +163,21 @@
     my $purpose = item_uplist($data->{purpose});
     $output{purpose} = $purpose if defined $purpose;
 
-    $selected = " selected ";    
+    $selected = " selected ";
   }
-  
+
   $hostlist .= "<option value=\"$thishost\"$selected>$thishost\n";
-  
+
   # collect summary info
   foreach $key (keys(%summaryattrs)) {
-    $summary{$thishost}{$key} = $data->{$key}->[0];
+    if (exists $summarylistitems{$key}) {
+      my $v = item_uplist($data->{$key});
+      $summary{$thishost}{$key} = $v if defined $v;
+    } else {
+      $summary{$thishost}{$key} = $data->{$key}->[0];
+    }
   }
-  
+
   $summary{$thishost}{hostname} = undef;
   foreach my $hostname (@{$data->{hostname}}) {
     $summary{$thishost}{hostname} .= sprintf("%s<a href=\"machines.cgi?host=%s\">%s</a>", ($summary{$thishost}{hostname} ? '<br>' : ''), $summary{$thishost}{host}, $hostname);