Index: /branches/eam_branch_20080618/ippScripts/scripts/ipp_cleanup.pl
===================================================================
--- /branches/eam_branch_20080618/ippScripts/scripts/ipp_cleanup.pl	(revision 18190)
+++ /branches/eam_branch_20080618/ippScripts/scripts/ipp_cleanup.pl	(revision 18191)
@@ -19,11 +19,12 @@
 
 # Parse the command-line arguments
-my ($stage, $camera, $class_id, $mode, $path_base, $dbname, $no_op, $help);
+my ($stage, $camera, $stage_id, $mode, $path_base, $dbname, $no_op, $help);
 GetOptions('stage=s'        => \$stage,     # which analysis stage to clean?
 	   'camera|i=s'     => \$camera,    # user-supplied camera name
-	   'class_id=s'     => \$class_id,  # class_id (only needed for certain stages)
+	   'stage_id=s'     => \$stage_id,  # id for this stage (only needed for certain stages)
 	   'mode|m=s'       => \$mode,      # cleanup mode (clean / purge)
 	   'path_base=s'    => \$path_base, # basename for files
 	   'dbname|d=s'     => \$dbname,    # Database name
+           'verbose'        => \$verbose,   # Print to stdout
 	   'no-op'          => \$no_op,     # pretend but don't actually inject
 	   'help'           => \$help       # give help listing
@@ -34,5 +35,5 @@
     defined $help;
 
-pod2usage( -msg => "Usage: $0 --camera (name) [--class_id class_id] --stage (stage) --mode (mode) --path_base (path) [--dbname dbname] [--no-op] [--help]", 
+pod2usage( -msg => "Usage: $0 --camera (name) --stage (stage) --stage_id stage_id --mode (mode) --path_base (path) [--dbname dbname] [--no-op] [--help]", 
 	   -exitval => 2 ) if 
     scalar @ARGV == 0;
@@ -52,30 +53,72 @@
 $ipprc->define_camera($camera);
 
+my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
+
 my $found = 0;
-my @files = ();
 
 # choice of files to delete depends on the stage
 if ($stage eq "chip") {
-    unless defined $class_id die "cleanup for chip stage requires class_id\n";
-    # delete the temporary image datafiles
-    addFilename (\@files, "PPIMAGE.OUTPUT", $path_base, $class_id);
-    addFilename (\@files, "PPIMAGE.OUTPUT.MASK", $path_base, $class_id);
-    addFilename (\@files, "PPIMAGE.OUTPUT.WEIGHT", $path_base, $class_id);
-    addFilename (\@files, "PPIMAGE.CHIP", $path_base, $class_id);
-    addFilename (\@files, "PPIMAGE.CHIP.MASK", $path_base, $class_id);
-    addFilename (\@files, "PPIMAGE.CHIP.WEIGHT", $path_base, $class_id);
-    if ($mode eq "purge") {
-	# additional files to remove for 'purge' mode
-	addFilename (\@files, "PPIMAGE.OUTPUT.FPA1", $path_base, $class_id);
-	addFilename (\@files, "PPIMAGE.OUTPUT.FPA2", $path_base, $class_id);
-	addFilename (\@files, "PPIMAGE.BIN1", $path_base, $class_id);
-	addFilename (\@files, "PPIMAGE.BIN2", $path_base, $class_id);
-	addFilename (\@files, "PPIMAGE.JPEG1", $path_base, $class_id);
-	addFilename (\@files, "PPIMAGE.JPEG", $path_base, $class_id);
-	addFilename (\@files, "PPIMAGE.STATS", $path_base, $class_id);
+    
+    # select the imfiles for this entry
+    # dettool -pendingcleanupimfile -chip_id $stage_id 
+
+    # Get list of component files
+    my $imfiles;                      # Array of component files
+    my $command = "$dettool -pendingcleanupimfile -chip_id $stage_id"; # Command to run
+    $command .= " -dbname $dbname" if defined $dbname;
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform camtool: $error_code", $cam_id, $error_code);
     }
-    delete_files (\@files);
-    
-    # need to run command "chiptool -donecleanup"
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
+        &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_PROG_ERROR);
+
+    # extract the metadata for the files into a hash list
+    $imfiles = parse_md_list($metadata) or
+        &my_die("Unable to parse metadata list", $cam_id, $PS_EXIT_PROG_ERROR);
+
+    # loop over all of the imfiles, determine the path_base and class_id for each
+    foreach my $imfile (@$imfiles) {
+	my $class_id = $imfile->{class_id};
+	my $path_base = $imfile->{path_base};
+
+	# array of actual filenames to delete
+	my @files = ();
+
+	# delete the temporary image datafiles
+	addFilename (\@files, "PPIMAGE.OUTPUT", $path_base, $class_id);
+	addFilename (\@files, "PPIMAGE.OUTPUT.MASK", $path_base, $class_id);
+	addFilename (\@files, "PPIMAGE.OUTPUT.WEIGHT", $path_base, $class_id);
+	addFilename (\@files, "PPIMAGE.CHIP", $path_base, $class_id);
+	addFilename (\@files, "PPIMAGE.CHIP.MASK", $path_base, $class_id);
+	addFilename (\@files, "PPIMAGE.CHIP.WEIGHT", $path_base, $class_id);
+	if ($mode eq "purge") {
+	    # additional files to remove for 'purge' mode
+	    addFilename (\@files, "PPIMAGE.OUTPUT.FPA1", $path_base, $class_id);
+	    addFilename (\@files, "PPIMAGE.OUTPUT.FPA2", $path_base, $class_id);
+	    addFilename (\@files, "PPIMAGE.BIN1", $path_base, $class_id);
+	    addFilename (\@files, "PPIMAGE.BIN2", $path_base, $class_id);
+	    addFilename (\@files, "PPIMAGE.JPEG1", $path_base, $class_id);
+	    addFilename (\@files, "PPIMAGE.JPEG", $path_base, $class_id);
+	    addFilename (\@files, "PPIMAGE.STATS", $path_base, $class_id);
+	}
+	
+	# actual command to delete the files
+	$status = &delete_files (\@files);
+
+	if (! $status)  {
+	    my $command = "$dettool -updateimfile -chip_id $stage_id -class_id $class_id -code 55"; # Command to run
+	    $command .= " -dbname $dbname" if defined $dbname;
+	    # call the command
+	    $fault = 1;
+	}
+    }
+
+    if (! $fault) {
+	my $command = "$dettool -updaterun -chip_id $chip_id -state clean";; # Command to run
+	$command .= " -dbname $dbname" if defined $dbname;
+	# need to run command "chiptool -donecleanup"
+    }
     exit 0;
 }