Changeset 28581

Timestamp:

Jul 1, 2010, 3:16:35 PM (16 years ago)

Author:

watersc1

Message:

Update to automation cleanups to queue magic destreak cleanups.

Added -l option to neb-ls which passes the files to ls -al to look at permissions and sizes.

Location:

trunk

Files:

• Nebulous/bin/neb-ls (modified) (3 diffs)
• ippScripts/scripts/automate_stacks.pl (modified) (3 diffs)
• ippconfig/recipes/nightly_science.config (modified) (3 diffs)

trunk/Nebulous/bin/neb-ls

@@ -17 +17 @@
     $server,
     $path,
+    $ls,
     $column,
 );
@@ -26 +27 @@
     'server|s=s'    => \$server,
     'path|p'        => \$path,
+    'l'             => \$ls,
     'column|c'      => \$column,
 ) || pod2usage( 2 );
@@ -61 +63 @@
     @{ $keys } = @files;
 } 
+if ($ls) {
+    my @files;
+    foreach my $key (@{ $keys }) {
+        my $uris = `ls -al $key`;
+        chomp($uris);
+        if (defined $uris) {
+            push @files, $uris;
+        }
+    }
+    @{ $keys } = @files;
+}    
 if ($keys) {
     if ($column) {

trunk/ippScripts/scripts/automate_stacks.pl

@@ -21 +21 @@
 my $stacktool= can_run('stacktool') or (warn "Can't find stacktool" and $missing_tools = 1);
 my $difftool = can_run('difftool') or (warn "Can't find difftool" and $missing_tools = 1);
+my $magicdstool = can_run('magicdstool') or (warn "Can't find magicdstool" and $missing_tools = 1);
 my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
 my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
@@ -1023 +1024 @@
     my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group,$reduction) = get_tool_parameters($cleaning_date,$target);
     my $args = $command;
-    if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode})) {
+    if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
         $args .= " -dbname $dbname -updaterun -set_state goto_cleaned -full -set_label goto_cleaned -time_stamp_end $cleaning_date ";
+    }
+    elsif ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'B')) {
+        $args .= " -dbname $dbname -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label $label ";
     }
     else {
@@ -1040 +1044 @@
 
     foreach my $mode (sort (keys (%clean_commands))) {
-        if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode})) {
+        if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
             my ($cleaning_date,$command) = construct_cleantool_args($date,"",$mode);
             if ($cleaning_date eq 'no clean') {

trunk/ippconfig/recipes/nightly_science.config

@@ -6 +6 @@
   COMMAND STR chiptool
   RETENTION_TIME U16 30
-  ALTERNATE_CMD BOOL F
 END
 CLEAN_MODES METADATA
@@ -12 +11 @@
   COMMAND STR warptool
   RETENTION_TIME U16 7
-  ALTERNATE_CMD BOOL F
 END
 CLEAN_MODES METADATA
@@ -19 +17 @@
 # RETENTION_TIME U16 30
   RETENTION_TIME S16 -1
-  ALTERNATE_CMD BOOL F
 END
 CLEAN_MODES METADATA
   MODE STR DIST
-  COMMAND STR disttool
+  COMMAND STR disttool -
   RETENTION_TIME S16 7
-  ALTERNATE_CMD BOOL T
+  ALTERNATE_CMD STR A
+END
+CLEAN_MODES METADATA
+  MODE STR MAGICDS
+  COMMAND STR magicdstool
+  RETENTION_TIME S16 1
+  ALTERNATE_CMD STR B
 END