Index: /tags/ipp-20110622/tools/diskspace/merge_counts_and_sizes.pl
===================================================================
--- /tags/ipp-20110622/tools/diskspace/merge_counts_and_sizes.pl	(revision 32602)
+++ /tags/ipp-20110622/tools/diskspace/merge_counts_and_sizes.pl	(revision 32603)
@@ -5,13 +5,20 @@
 use PS::IPP::Config;
 
-getopts('N',\%opt);
+getopts('ND:',\%opt);
 
 my $ipprc = PS::IPP::Config->new("GPC1");
 my $nebcon = $ipprc->nebulous();
 
-my @lt = gmtime;
-my $dt = 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;
+}
 
 my $summary_file = "neb:///ipp_diskspace/${datestring}/summary.dat";
@@ -94,10 +101,11 @@
 
 if (exists($opt{N})) {
-    my $dt = DateTime->now;
+#     my $dt = DateTime->now;
 
-    my @lt = gmtime;
-    my $dt_data = DateTime->now;
-    $dt->subtract( days => $lt[6]);
-    my $datestring = $dt->ymd;
+#     my @lt = gmtime;
+#     my $dt_data = DateTime->now;
+#     $dt->subtract( days => $lt[6]);
+#     my $datestring = $dt->ymd;
+
     my $ipprc = PS::IPP::Config->new("GPC1");
     my $nebcon = $ipprc->nebulous();
@@ -123,4 +131,7 @@
 	if ($stage eq 'RAW') {
 	    $label = "PERMANENT";
+	}
+	elsif ($stage eq 'EXTERNAL') {
+	    $label = 'EXTERNAL';
 	}
 	else {
Index: /tags/ipp-20110622/tools/diskspace/nebulous_data.pl
===================================================================
--- /tags/ipp-20110622/tools/diskspace/nebulous_data.pl	(revision 32602)
+++ /tags/ipp-20110622/tools/diskspace/nebulous_data.pl	(revision 32603)
@@ -61,5 +61,18 @@
 my $neb_dir = "/data/${neb}/nebulous/";
 
+my $total_volume = 0;
+my $used_volume  = 0;
+open(DF,"df -B 1 /data/${neb}/ |") || die "Cannot run df\n";
+while(<DF>) {
+    chomp;
+    if ($_ =~ /${neb}/) {
+	$used_volume = (split /\s+/, $_)[2];
+    }
+}
+close(DF);
+
 open(FIND,"find $neb_dir -type f -printf \"%f %s\n\" |") || die "Cannot run find.\n";
+
+
 while (<FIND>) {
     chomp;
@@ -88,6 +101,8 @@
     $count{$stage}{$product} += 1;
     $volume{$stage}{$product} += $size;
+    $total_volume += $size;
 }
 close(FIND);
+
 
 
@@ -98,4 +113,6 @@
     }
 }
+my $external_volume = $used_volume - $total_volume;
+print $out_fh "EXTERNAL UNKNOWN 1 $external_volume\n";
 
 close($out_fh);
Index: /tags/ipp-20110622/tools/diskspace/run_counter.pl
===================================================================
--- /tags/ipp-20110622/tools/diskspace/run_counter.pl	(revision 32602)
+++ /tags/ipp-20110622/tools/diskspace/run_counter.pl	(revision 32603)
@@ -77,4 +77,5 @@
     }
 }
+print $out_fh "EXTERNAL any 1\n";
 close($out_fh);
 
Index: /tags/ipp-20110622/tools/diskspace/sizes_from_counts.pl
===================================================================
--- /tags/ipp-20110622/tools/diskspace/sizes_from_counts.pl	(revision 32602)
+++ /tags/ipp-20110622/tools/diskspace/sizes_from_counts.pl	(revision 32603)
@@ -1,7 +1,28 @@
 #! /usr/local/bin/perl -w
+
+
+use Getopt::Std;
+use DateTime;
+use PS::IPP::Config;
+
+getopts('D:',\%opt);
+
 my $count_list = shift;
+my $ipprc = PS::IPP::Config->new("GPC1");
+my $nebcon = $ipprc->nebulous();
+
+
+if (exists($opt{D})) {
+    my $datestring = $opt{D};
+    my $usage_data = "neb:///ipp_diskspace/${datestring}/usage_report.dat";
+    my $real_file  = $ipprc->file_resolve($usage_data);
+    open(DATA,$real_file) || die "Cannot find usage_report.dat\n";
+}
 
 while(<DATA>) {
     chomp;
+    if ($_ =~ /^\s+/) {
+	next;
+    }
     ($stage,$state,$label,undef,$rate,$count) = split /\s+/;
     $data{$stage}{$state}{L} = $label;