src/hg/encode/encodeLoad/doEncodeUnload.pl 1.5

Index: src/hg/encode/encodeLoad/doEncodeUnload.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/encode/encodeLoad/doEncodeUnload.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -B -U 4 -r1.4 -r1.5
--- src/hg/encode/encodeLoad/doEncodeUnload.pl	8 Oct 2008 00:06:46 -0000	1.4
+++ src/hg/encode/encodeLoad/doEncodeUnload.pl	15 Mar 2010 22:21:53 -0000	1.5
@@ -15,16 +15,18 @@
 use warnings;
 use strict;
 
 use Getopt::Long;
+use Cwd;
 use File::Basename;
 
 use lib "/cluster/bin/scripts";
 use Encode;
+use RAFile;
 use HgDb;
 use HgAutomate;
 
-use vars qw/$opt_verbose/;
+use vars qw/$opt_verbose $opt_configDir/;
 my $PROG = basename $0;
 
 sub usage
 {
@@ -59,16 +61,28 @@
 # Main
 
 # Change dir to submission directory obtained from command-line
 
-GetOptions("verbose=i") || usage();
+my $wd = cwd();
+
+GetOptions("configDir=s", "verbose=i") || usage();
 $opt_verbose = 1 if (!defined $opt_verbose);
 if(@ARGV != 2) {
     usage();
 }
 
 my $submitType = $ARGV[0];	# currently not used
 my $submitDir = $ARGV[1];	# directory where data files are
+my $configPath;
+if (defined $opt_configDir) {
+    if ($opt_configDir =~ /^\//) {
+        $configPath = $opt_configDir;
+    } else {
+        $configPath = "$wd/$opt_configDir";
+    }
+} else {
+    $configPath = "$submitDir/../config"
+}
 
 # Add a suffix for non-production loads (to avoid loading over existing tables).
 
 my $tableSuffix = "";
@@ -90,14 +104,21 @@
 }
 
 HgAutomate::verbose(2, "Unloading project in directory $submitDir\n");
 
+my $grants = Encode::getGrants($configPath);
+my $fields = Encode::getFields($configPath);
+my $daf = Encode::getDaf($submitDir, $grants, $fields);
+my $downloadDir = Encode::downloadDir($daf);
+
 # Unload resources listed in unload.ra
 my %ra = RAFile::readRaFile($unloadRa, 'tablename');
 my $db;
 for my $key (keys %ra) {
     my $h = $ra{$key};
     my $tablename = $h->{tablename} . $tableSuffix;
+    my $files = $h->{files};
+    my @files = split(/\s+/, $files);
 
     my $str = "\nkeyword: $key\n";
     for my $field (qw(tablename type assembly files)) {
         if($h->{$field}) {
@@ -123,7 +144,18 @@
         unloadWig($assembly, $db, $tablename);
     } else {
         die "ERROR: unknown type: $h->{type} in load.ra ($PROG)\n";
     }
+
+    # delete the download files
+    my $target = "$downloadDir/$tablename.$type.gz";
+    if(@files == 1 && $files[0] =~ /^$Encode::autoCreatedPrefix/) {
+        $target = "$downloadDir/raw/$tablename.$type.gz";
+        if (! -d "$downloadDir/raw") {
+            mkdir "$downloadDir/raw" or die "Could not create dir [$downloadDir/raw] error: [$!]\n";
+            }
+    }
+    $target =~ s/ //g;  # removes space in ".bed 5.gz" for example
+    unlink $target;
 }
 
 exit(0);