Index: trunk/tools/diskspace/nebulous_wiki.pl
===================================================================
--- trunk/tools/diskspace/nebulous_wiki.pl	(revision 32230)
+++ trunk/tools/diskspace/nebulous_wiki.pl	(revision 32265)
@@ -2,12 +2,24 @@
 
 use DateTime;
-$dt = DateTime->now;
+use Getopt::Std;
+use PS::IPP::Config;
 
 
-@files = sort (<*.size.dat>);
+$opt{S} = 0;
+getopts('S',\%opt);
+
+my $dt = DateTime->now;
+
+my @lt = gmtime;
+my $dt_data = DateTime->now;
+$dt->subtract( days => $lt[6]);
+my $datestring = $dt->ymd;
+
+@files = sort ( split /\n/, `neb-ls -p neb:///ipp_diskspace/${datestring}/%neb_usage.dat`);
 
 foreach $f (@files) {
     $volume = $f;
-    $volume =~ s/.size.dat//;
+    $volume =~ s/.*://;
+    $volume =~ s/.neb_usage.dat//;
     open(F,$f);
     while(<F>) {
@@ -37,26 +49,47 @@
 $presep = '||';
 
-print "${presep}Volume${sep}";
-foreach $w (sort (keys %sizes)) {
-    print "$w$sep";
-}
-print "\n";
-foreach $v (sort (keys %sum)) {
-    print "${presep}${v}${sep}";
+if ($opt{S} == 0) {
+    print "${presep}Volume${sep}";
     foreach $w (sort (keys %sizes)) {
-	$val = $vol{$v}{$w} / 1024 / 1024 / 1024;
+	print "$w$sep";
+    }
+    print "\n";
+    foreach $v (sort (keys %sum)) {
+	print "${presep}${v}${sep}";
+	foreach $w (sort (keys %sizes)) {
+	    $val = $vol{$v}{$w} / 1024 / 1024 / 1024;
+	    printf "%.2f%s",$val,$sep;
+	}
+	$val = $sum{$v} / 1024 / 1024 / 1024;
+	printf "%.2f%s",$val,$sep;
+	print "\n";
+    }
+    $date = $dt->ymd;
+    print "${presep}${date}${sep}";
+    foreach $w (sort (keys %sizes)) {
+	$val = $sizes{$w} / 1024 / 1024 / 1024;
 	printf "%.2f%s",$val,$sep;
     }
-    $val = $sum{$v} / 1024 / 1024 / 1024;
-    printf "%.2f%s",$val,$sep;
     print "\n";
 }
-$date = $dt->ymd;
-print "${presep}${date}${sep}";
-foreach $w (sort (keys %sizes)) {
-    $val = $sizes{$w} / 1024 / 1024 / 1024;
-    printf "%.2f%s",$val,$sep;
+else {
+    my $ipprc = PS::IPP::Config->new("GPC1");
+    my $nebcon = $ipprc->nebulous();
+
+    my $outfile = "neb:///ipp_diskspace/${datestring}/summary.dat";
+    my $out_fh;
+    if ($ipprc->file_exists($outfile)) {
+	my $S_file = $ipprc->file_resolve($outfile);
+	open($out_fh,">$S_file");
+    }
+    else {
+	$out_fh = $ipprc->file_create_open($outfile);
+    }
+    foreach $w (sort (keys %sizes)) {
+	$val = $sizes{$w} / 1024 / 1024 / 1024;
+	print $out_fh "$w $val\n";
+    }
+    close($out_fh);
 }
-print "\n";