Index: trunk/ippScripts/scripts/relgroup_exp_list.pl
===================================================================
--- trunk/ippScripts/scripts/relgroup_exp_list.pl	(revision 35329)
+++ trunk/ippScripts/scripts/relgroup_exp_list.pl	(revision 35361)
@@ -16,10 +16,11 @@
 
 
-my ($group_id, $group_type, $lap_id, $release_name, $rebuild, $dbname, $no_update, $verbose);
+my ($group_id, $group_type, $lap_id, $group_name, $release_name, $rebuild, $dbname, $no_update, $verbose);
 
 GetOptions(
     'group_id=s'    =>      \$group_id,
+    'group_type=s'  =>      \$group_type,
     'lap_id=s'      =>      \$lap_id,
-    'group_type=s'  =>      \$group_type,
+    'group_name=s'  =>      \$group_name,
     'release_name=s' =>     \$release_name,
     'rebuild'       =>      \$rebuild,      # rebuild directory if it exists
@@ -36,4 +37,9 @@
            -exitval => 3) 
         unless $lap_id;
+    $group_name = "lap_$lap_id";
+} else {
+    pod2usage( -msg => "--group_name is required with --group_type $group_type",
+           -exitval => 3) 
+        unless $group_name;
 }
 
@@ -48,52 +54,26 @@
 
 # XXX: get this from site.config
-my $outputBase = "/data/ippc17.0/www/ipp-misc/ps1-data/single-frame/$release_name";
-
-my $outdir;
-if ($group_type eq 'lap') {
-    $outdir = "$outputBase/lap_$lap_id";
-    if (-e $outdir) {
-        if ($rebuild) {
-            my $rc = system "rm -rf $outdir";
-            if ($rc) {
-                my $status = $rc >> 8;
-                my_die("failed to remove existing directory $outdir: $rc $status", $group_id, $PS_EXIT_UNKNOWN_ERROR);
-            }
-        } else {
-            my_die("directory $outdir already exists and --rebuild not supplied", $group_id, $PS_EXIT_UNKNOWN_ERROR);
-        }
-    }
-} else {
-    my_die("Not ready to do group_type $group_type\n", $group_id, $PS_EXIT_UNKNOWN_ERROR);
+my $exposureListRoot = "/data/ippc17.0/www/ipp-misc/ps1-data/single-frame";
+
+my $outputBase = "$exposureListRoot/$release_name";
+
+if (!-e $outputBase) {
+    mkdir $outputBase or &my_die("Failed to create $outputBase", $group_id, $PS_EXIT_SYS_ERROR);
+}
+
+my $outdir = "$outputBase/$group_name";
+if (-e $outdir) {
+    if ($rebuild) {
+        my $rc = system "rm -rf $outdir";
+        if ($rc) {
+            my $status = $rc >> 8;
+            my_die("failed to remove existing directory $outdir: $rc $status", $group_id, $PS_EXIT_UNKNOWN_ERROR);
+        }
+    } else {
+        my_die("directory $outdir already exists and --rebuild not supplied", $group_id, $PS_EXIT_UNKNOWN_ERROR);
+    }
 }
 
 mkdir $outdir or my_die ("failed to create $outdir", $group_id, $PS_EXIT_UNKNOWN_ERROR);
-
-if (0) {
-    # XXX: old code from prototype for nightly lists
-        my $outroot;
-        my $oh;
-        my ($year, $month, $day);
-        if ($outroot) {
-        die "usage: $0 <year> <month> <day>\n" unless $year and $month and $day;
-            my $monthdir = sprintf "$outroot/%4d/%02d", $year, $month;
-            if (! -e $monthdir) {
-                die "can't find directory for $year-$month\n";
-            }
-            my $daydir = sprintf "$monthdir/%02d", $day;
-            if (! -e $daydir) {
-                mkdir $daydir or die "failed to create $daydir\n";
-            }
-            my $outfile = sprintf "$daydir/index.html", $day;
-            open $oh, ">$outfile" or die "failed to open $outfile";
-        } else {
-            $oh = *STDOUT;
-        }
-
-        my $ticks = timegm(0, 0, 0, $day, $month - 1, $year - 1900);
-
-        my $mjd = 40587 + ($ticks / 86400.);
-        my $date = sprintf "%04d-%02d-%02d", $year, $month, $day;
-}
 
 my $oh;
@@ -105,5 +85,10 @@
 open $oh2, ">$outfile2" or my_die("failed to open $outfile2", $group_id, $PS_EXIT_UNKNOWN_ERROR);
 
-my $title = "PS1 Exposure List for $release_name LAP run $lap_id";
+my $title = "PS1 Exposure List for";
+if ($group_type eq 'lap') {
+    $title .= " $release_name LAP run $lap_id";
+} else {
+    $title .= " $group_name";
+}
 
 my $head = "
@@ -125,5 +110,5 @@
 
 
-# find all exposures on given day that have a chip run
+# find all exposures in this relGroup
 my $query = "
 SELECT 
@@ -149,5 +134,5 @@
 $stmt->execute() or my_die("failed to execute query: $stmt->errstr\n", $group_id, $PS_EXIT_UNKNOWN_ERROR);
 
-printf STDERR "%4d exposures in group for LAP run $lap_id\n", $stmt->rows;
+printf STDERR "%4d exposures in group for $group_name\n", $stmt->rows;
 
 # $stmt->dump_results(1000);