Changeset 32630 for branches/eam_branches/ipp-20110906/tools/diskspace/nebulous_wiki.pl

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• tools/diskspace/nebulous_wiki.pl (modified) (4 diffs)

branches/eam_branches/ipp-20110906/tools/diskspace/nebulous_wiki.pl

@@ -7 +7 @@
 
 $opt{S} = 0;
-getopts('S',\%opt);
+getopts('SD:',\%opt);
 
-my $dt = DateTime->now;
-
-my @lt = gmtime;
-my $dt_data = DateTime->now;
-$dt->subtract( days => $lt[6]);
-my $datestring = $dt->ymd;
+my $datestring;
+if (exists($opt{D})) {
+    $datestring = $opt{D};
+}
+else {
+    my @lt = gmtime;
+    my $dt = DateTime->now;
+    $dt->subtract( days => $lt[6] );
+    $datestring = $dt->ymd;
+}
 
 @files = sort ( split /\n/, `neb-ls -p neb:///ipp_diskspace/${datestring}/%neb_usage.dat`);
@@ -32 +36 @@
         $sum{$volume} += $size;
         $sizes{$what}   += $size;
+        $counts{$what}  += $count;
     }
     close(F);
@@ -65 +70 @@
         print "\n";
     }
+    my $dt = DateTime->now;
     $date = $dt->ymd;
     print "${presep}${date}${sep}";
@@ -88 +94 @@
     foreach $w (sort (keys %sizes)) {
         $val = $sizes{$w} / 1024 / 1024 / 1024;
-        print $out_fh "$w $val\n";
+        $v2  = $counts{$w};
+        print $out_fh "$w $val $v2\n";
     }
     close($out_fh);