Changeset 32602 for trunk/tools/diskspace/merge_counts_and_sizes.pl

Timestamp:

Nov 2, 2011, 2:46:41 PM (15 years ago)

Author:

watersc1

Message:

Add date options as needed. Handle non-nebulous space in a way that allows it to be accounted better.

File:

• trunk/tools/diskspace/merge_counts_and_sizes.pl (modified) (3 diffs)

trunk/tools/diskspace/merge_counts_and_sizes.pl

@@ -5 +5 @@
 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 +101 @@
 
 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 +131 @@
         if ($stage eq 'RAW') {
             $label = "PERMANENT";
+        }
+        elsif ($stage eq 'EXTERNAL') {
+            $label = 'EXTERNAL';
         }
         else {