Index: /branches/czw_branch/20101203/ippScripts/Build.PL
===================================================================
--- /branches/czw_branch/20101203/ippScripts/Build.PL	(revision 29981)
+++ /branches/czw_branch/20101203/ippScripts/Build.PL	(revision 29982)
@@ -107,4 +107,5 @@
         scripts/lossy_compress_imfile.pl
         scripts/ipp_apply_burntool.pl
+        scripts/ipp_apply_burntool_single.pl
         scripts/make_burntool_pcontrol.pl
         scripts/bundle_detrends.pl
Index: /branches/czw_branch/20101203/ippScripts/MANIFEST
===================================================================
--- /branches/czw_branch/20101203/ippScripts/MANIFEST	(revision 29981)
+++ /branches/czw_branch/20101203/ippScripts/MANIFEST	(revision 29982)
@@ -39,4 +39,5 @@
 scripts/lossy_compress_imfile.pl
 scripts/ipp_apply_burntool.pl
+scripts/ipp_apply_burntool_single.pl
 scripts/make_burntool_pcontrol.pl
 scripts/bundle_detrends.pl
Index: /branches/czw_branch/20101203/ippScripts/scripts/ipp_apply_burntool_single.pl
===================================================================
--- /branches/czw_branch/20101203/ippScripts/scripts/ipp_apply_burntool_single.pl	(revision 29981)
+++ /branches/czw_branch/20101203/ippScripts/scripts/ipp_apply_burntool_single.pl	(revision 29982)
@@ -150,5 +150,5 @@
 my $command = "$regtool -dbname $dbname -updateprocessedimfile -exp_id $exp_id -class_id $class_id -burntool_state $outState";
 if ($imfile_state ne 'full') {
-    $command .= " -state full ";
+    $command .= " -set_state full ";
 }
 $status = vsystem ($command, $REALRUN);
Index: /branches/czw_branch/20101203/ippScripts/scripts/register_exp.pl
===================================================================
--- /branches/czw_branch/20101203/ippScripts/scripts/register_exp.pl	(revision 29981)
+++ /branches/czw_branch/20101203/ippScripts/scripts/register_exp.pl	(revision 29982)
@@ -30,4 +30,5 @@
 my $regtool = can_run('regtool') or (warn "can't find regtool" and $missing_tools = 1);
 my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
 if ($missing_tools) {
     warn ("Can't find required tools");
@@ -118,4 +119,12 @@
 if (uc($exp_type) eq "NULL") { &my_die ("exp_type  not found", $exp_id, $PS_EXIT_CONFIG_ERROR); }
 
+my ($data_group,$dist_group,$chip_workdir,$reduction);
+($label,$data_group,$dist_group,$end_stage,
+ $tess_id,$chip_workdir,$reduction) = advance_decisions(&value_for_flag($cmdflags,"-dateobs"),
+							&value_for_flag($cmdflags,"-exp_type"),
+							&value_for_flag($cmdflags,"-obs_mode"),
+							&value_for_flag($cmdflags,"-object"),
+							&value_for_flag($cmdflags,"-comment"),
+							$dbname);
 my $command = "$regtool -addprocessedexp";
 $command .= " -exp_id $exp_id";
@@ -127,4 +136,8 @@
 $command .= " -end_stage $end_stage" if defined $end_stage;
 $command .= " -tess_id   $tess_id"   if defined $tess_id;
+$command .= " -data_group $data_group" if defined $data_group;
+$command .= " -dist_group $dist_group" if defined $dist_group;
+$command .= " -chip_workdir $chip_workdir" if defined $chip_workdir;
+$command .= " -reduction  $reduction"  if defined $reduction;
 $command .= " -state full";
 $command .= " $cmdflags";
@@ -156,4 +169,145 @@
 
 ### Pau.
+sub advance_decisions {
+    my $dateobs = shift;
+    my $exptype = shift;
+    my $obsmode = shift;
+    my $object  = shift;
+    my $comment = shift;
+    my $dbname  = shift;
+
+    # The strings come pre-quoted.
+    $dateobs =~ s/\'//g;
+    $exptype =~ s/\'//g;
+    $obsmode =~ s/\'//g;
+    $object =~ s/\'//g;
+    $comment =~ s/\'//g;
+
+    print "Inside decision engine\n";
+    my ($label,$data_group,$dist_group,$end_stage,$tess_id,$chip_workdir,$reduction);
+    my $target;
+
+    if ($exptype ne 'OBJECT') {
+	print "Aborting because exptype doesn't claim to be OBJECT: $exptype\n";
+	return(undef,undef,undef,"reg",undef,undef,undef);
+    }
+    if ($obsmode eq 'ENGINEERING') {
+	print "Aborting because we don't queue engineering data to chip\n";
+	return(undef,undef,undef,"reg",undef,undef,undef);
+    }
+    # Grab the configuration data.
+    my %nightlyscience_config = ();
+    my $conf_cmd = "$ppConfigDump -dump-recipe NIGHTLY_SCIENCE -";
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+	run(command => $conf_cmd, verbose => $verbose);
+    unless ($success) {
+	$error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+	&my_die("Unable to perform ppConfigDump: $error_code", $date, $PS_EXIT_SYS_ERROR);
+    }
+    print "data loaded\n";
+    my $mdcParser = PS::IPP::Metadata::Config->new;
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf);
+    foreach my $entry (@{ $metadata }) {
+	if (${ $entry }{name} eq 'TARGETS') {
+	    my @target_data = @{ ${ $entry }{value} };
+	    my $this_target = '';
+	    foreach my $tentry (@target_data) {
+		if (${ $tentry }{name} eq 'NAME') {
+		    $this_target = ${ $tentry }{value};
+		    $nightlyscience_config{$this_target}{DISTRIBUTION} = $this_target;
+		}
+		elsif (${ $tentry }{name} eq 'DISTRIBUTION') {
+		    $nightlyscience_config{$this_target}{DISTRIBUTION} = ${ $tentry }{value};
+		}
+		elsif (${ $tentry }{name} eq 'TESS') {
+		    $nightlyscience_config{$this_target}{TESS_ID} = ${ $tentry }{value};
+		}
+		elsif (${ $tentry }{name} eq 'OBSMODE') {
+		    $nightlyscience_config{$this_target}{OBSMODE} = ${ $tentry }{value};
+		    $nightlyscience_config{$this_target}{OBSMODE} =~ s/%/\.\*/g;
+		}
+		elsif (${ $tentry }{name} eq 'OBJECT') {
+		    $nightlyscience_config{$this_target}{OBJECT} = ${ $tentry }{value};
+		    $nightlyscience_config{$this_target}{OBJECT} =~ s/%/\.\*/g;
+		}
+		elsif (${ $tentry }{name} eq 'COMMENT') {
+		    $nightlyscience_config{$this_target}{COMMENT} = ${ $tentry }{value};
+		    $nightlyscience_config{$this_target}{COMMENT} =~ s/%/\.\*/g;
+		}
+		elsif (${ $tentry }{name} eq 'STACKABLE') {
+		    $nightlyscience_config{$this_target}{STACKABLE} = ${ $tentry }{value};
+		}
+		elsif (${ $tentry }{name} eq 'EXTRA_PROCESSING') {
+		    $nightlyscience_config{$this_target}{EXTRA_PROCESSING} = ${ $tentry }{value};
+		}
+		elsif (${ $tentry }{name} eq 'REDUCTION') {
+		    $nightlyscience_config{$this_target}{REDUCTION} = ${ $tentry }{value};
+		}
+	    }
+	}
+    }
+    print "data parsed\n";
+    my $found_target;
+    foreach $target (keys %nightlyscience_config) {
+#	print "TEST: $target ($obsmode $object $comment) ($nightlyscience_config{$target}{OBSMODE} $nightlyscience_config{$target}{OBJECT} $nightlyscience_config{$target}{COMMENT}\t";
+	my $match = 0;
+	my $possible = 0;
+	if (exists($nightlyscience_config{$target}{OBSMODE})) {
+	    $possible++;
+	    if ($obsmode =~ /$nightlyscience_config{$target}{OBSMODE}/) {
+		$match++;
+	    }
+	}
+	if (exists($nightlyscience_config{$target}{OBJECT})) {
+	    $possible++;
+	    if ($object =~ /$nightlyscience_config{$target}{OBJECT}/) {
+		$match++;
+	    }
+	}
+	if (exists($nightlyscience_config{$target}{COMMENT})) {
+	    $possible++;
+	    if ($comment =~ /$nightlyscience_config{$target}{COMMENT}/) {
+		$match++;
+	    }
+	}
+	print "$possible $match\n";
+	if (($possible > 0)&&($match == $possible)) {
+	    $found_target = $target;
+	    last;
+	}
+    }
+    unless ($found_target) {
+	print "No acceptible target found.\n";
+	return(undef,undef,undef,"reg",undef,undef,undef);
+    }
+    print "Found this target: $found_target\n";
+    print "$dateobs\n";
+    $target = $found_target;
+    
+    my $date  = $dateobs;
+    $date =~ s/T.*//;
+    my $workdir_date = $date;
+    $date =~ s/-//g;
+    $workdir_date =~ s%-%/%g;
+    print "$dateobs $date $workdir_date\n";    
+    $label = "${target}.nightlyscience";
+    $data_group = "${target}.${date}";
+    $dist_group = $nightlyscience_config{$target}{DISTRIBUTION};
+    $end_stage  = 'warp';
+    $tess_id    = $nightlyscience_config{$target}{TESS_ID};
+    $chip_workdir = "neb://\@HOST\@.0/${dbname}/TESTING/${target}.nt/${workdir_date}/";
+    if (exists($nightlyscience_config{$target}{REDUCTION})) {
+	$reduction  = $nightlyscience_config{$target}{REDUCTION};
+    }
+    else {
+	undef($reduction);
+    }
+
+    
+    return ($label,$data_group,$dist_group,$end_stage,$tess_id,$chip_workdir,$reduction);
+}
+	    
+	    
+	    
 
 sub cache_run
Index: /branches/czw_branch/20101203/ippScripts/scripts/register_imfile.pl
===================================================================
--- /branches/czw_branch/20101203/ippScripts/scripts/register_imfile.pl	(revision 29981)
+++ /branches/czw_branch/20101203/ippScripts/scripts/register_imfile.pl	(revision 29982)
@@ -19,6 +19,7 @@
 use File::Basename qw( basename);
 use IPC::Run;
-use IPC::Cmd 0.36 qw( can_run );
+use IPC::Cmd 0.36 qw( can_run run );
 use PS::IPP::Config 1.01 qw( :standard );
+use PS::IPP::Metadata::List qw( parse_md_list );
 use PS::IPP::Metadata::Config;
 use Math::Trig;
@@ -179,4 +180,5 @@
 $command .= " $cmdflags";
 
+print "$command\n";
 # determine solar-system parameters
 my $longitude = &value_for_flag($cmdflags, 0.0, "-longitude");
@@ -235,11 +237,20 @@
 
 { 
+    my $mdcParser  = PS::IPP::Metadata::Config->new;
+
+    my $class_id   = &value_for_flag($cmdflags, 0.0, "-class_id");
+    my $check_date       = &value_for_flag($cmdflags, 0.0, "-dateobs");
+    $check_date =~ s/T.*$//;
+    my $exp_name   = $tmp_exp_name;
+    
+
     my $bt_check_command = "$regtool -checkburntoolimfile ";
-    $bt_check_command = " -class_id $class_id ";
-    $bt_check_command = " -date $date ";
-    $bt_check_command = " -exp_name $exp_name ";
-    $bt_check_command = " -dbname $dbname" if defined $dbname;
-
-    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    $bt_check_command .= " -class_id $class_id ";
+    $bt_check_command .= " -date $check_date ";
+    $bt_check_command .= " -valid_burntool $burntoolStateGood ";
+    $bt_check_command .= " -exp_name $exp_name ";
+    $bt_check_command .= " -dbname $dbname" if defined $dbname;
+
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
 	run ( command => $bt_check_command, verbose => $verbose);
     unless ($success) {
@@ -270,18 +281,19 @@
     
     my $regtool_update = "$regtool -updateprocessedimfile ";
-    $regtool_update .= "-dbname $dbname" if defined $dbname;
+    $regtool_update .= "-dbname $dbname " if defined $dbname;
     $regtool_update .= "-exp_id $exp_id -class_id $class_id ";
 
     my $burntool_data = pop(@{ $exposures });
     if ($burntool_data->{burnable} == 0) {
-	$regtool_update .= " -burntool_state 0 -data_state pending_burntool ";
+	$regtool_update .= " -burntool_state 0 -set_state pending_burntool ";
     }
     else {
 	my $apply_command = "$ippApplyBurntoolSingle --dbname $dbname ";
 	$apply_command .= " --class_id $class_id --exp_id $exp_id ";
-	$apply_command .= " --this_uri $burntool_data->{this_uri} ";
+	$apply_command .= " --this_uri $burntool_data->{uri} ";
 	$apply_command .= " --previous_uri $burntool_data->{previous_uri} " if defined $burntool_data->{previous_uri};
 	$apply_command .= " --imfile_state $burntool_data->{imfile_state} ";
 	$apply_command .= " --verbose " if $verbose;
+	print "$apply_command\n";
 	my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
 	    IPC::Cmd::run(command => $apply_command, verbose => $verbose);
Index: /branches/czw_branch/20101203/ippTasks/Makefile.am
===================================================================
--- /branches/czw_branch/20101203/ippTasks/Makefile.am	(revision 29981)
+++ /branches/czw_branch/20101203/ippTasks/Makefile.am	(revision 29982)
@@ -47,4 +47,5 @@
 	site.manoa.pro \
 	site.mhpcc.pro \
+	site.mhpcc_testing.pro \
 	surveys.mhpcc.config \
 	simtest.pro \
Index: /branches/czw_branch/20101203/ippTasks/register.pro
===================================================================
--- /branches/czw_branch/20101203/ippTasks/register.pro	(revision 29981)
+++ /branches/czw_branch/20101203/ippTasks/register.pro	(revision 29982)
@@ -64,4 +64,6 @@
   end
 end
+
+$valid_burntool_value = 14
 
 macro replace.survey.values
@@ -144,4 +146,5 @@
 # these variables will cycle through the known database names
 $regPendingImfile_DB = 0
+$regPendingBurntoolImfile_DB = 0
 $regPendingExp_DB = 0
 
@@ -461,4 +464,8 @@
   task.exec
     $run = regtool -pendingburntoolimfile
+    $today = `date -u +%Y-%m-%d`
+# debugging purposes
+    $today = "2010-12-06"
+    $run = $run -date $today -valid_burntool $valid_burntool_value
     if ($DB:n == 0)
       option DEFAULT
@@ -471,6 +478,5 @@
     end
 
-    $today = `date +%Y-%m-%d`
-    $run = $run -date $today -valid_burntool $valid_burntool_value
+    echo $run
     add_poll_args run
     command $run
Index: /branches/czw_branch/20101203/ippTools/share/chiptool_find_rawexp.sql
===================================================================
--- /branches/czw_branch/20101203/ippTools/share/chiptool_find_rawexp.sql	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/share/chiptool_find_rawexp.sql	(revision 29982)
@@ -1,9 +1,10 @@
 -- this query is used to find potental rawExps to be queued for chiptool
 -- processeing
-SELECT
+SELECT DISTINCT 
     rawExp.*,
     newExp.label
 FROM rawExp
 JOIN newExp using (exp_id)
+LEFT JOIN chipRun USING (exp_id)
 WHERE
     rawExp.fault = 0
Index: /branches/czw_branch/20101203/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- /branches/czw_branch/20101203/ippTools/share/pxadmin_create_tables.sql	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/share/pxadmin_create_tables.sql	(revision 29982)
@@ -9,4 +9,5 @@
     uri VARCHAR(255),
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    use_compress SMALLINT,
     PRIMARY KEY(camera, telescope)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
Index: /branches/czw_branch/20101203/ippTools/share/regtool_pendingburntoolimfile.sql
===================================================================
--- /branches/czw_branch/20101203/ippTools/share/regtool_pendingburntoolimfile.sql	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/share/regtool_pendingburntoolimfile.sql	(revision 29982)
@@ -25,5 +25,5 @@
 	    LEFT JOIN newImfile USING(exp_id)
             LEFT JOIN rawExp USING(exp_id, exp_name)
-            LEFT JOIN rawImfile ON (rawImfile.exp_name = rawExp.exp_name AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
+            LEFT JOIN rawImfile ON (rawImfile.exp_name = newExp.tmp_exp_name AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
        WHERE
              summitExp.dateobs >= '@DATE@T00:00:00'
Index: /branches/czw_branch/20101203/ippTools/share/regtool_pendingexp.sql
===================================================================
--- /branches/czw_branch/20101203/ippTools/share/regtool_pendingexp.sql	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/share/regtool_pendingexp.sql	(revision 29982)
@@ -39,4 +39,5 @@
         newExp.state = 'run'
         AND rawExp.exp_id IS NULL
+	AND rawImfile.data_state = 'full'
 -- where hook %s
     GROUP BY
Index: /branches/czw_branch/20101203/ippTools/src/chiptool.c
===================================================================
--- /branches/czw_branch/20101203/ippTools/src/chiptool.c	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/src/chiptool.c	(revision 29982)
@@ -271,7 +271,8 @@
 
     // default
+    PXOPT_LOOKUP_BOOL(unique, config->args, "-unique", false);
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-
+    
     // find the exp_id of all the exposures that we want to queue up.
     psString query = pxDataGet("chiptool_find_rawexp.sql");
@@ -288,4 +289,8 @@
     psFree(where);
 
+    if (unique) {
+      psStringAppend(&query, "AND chip_id IS NULL");
+    }
+    
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
Index: /branches/czw_branch/20101203/ippTools/src/chiptoolConfig.c
===================================================================
--- /branches/czw_branch/20101203/ippTools/src/chiptoolConfig.c	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/src/chiptoolConfig.c	(revision 29982)
@@ -61,4 +61,5 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dist_group",  0,      "define distribution group", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_note",  0,           "define note", NULL);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-unique",   0,           "only queue exposures that have no previous chipRun", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,            "do not actually modify the database", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
Index: /branches/czw_branch/20101203/ippTools/src/pztool.c
===================================================================
--- /branches/czw_branch/20101203/ippTools/src/pztool.c	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/src/pztool.c	(revision 29982)
@@ -112,5 +112,5 @@
     PXOPT_LOOKUP_STR(telescope, config->args, "-telescope", true, false);
     PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
-
+    
     if (!pzDataStoreInsert(config->dbh,
             camera,
Index: /branches/czw_branch/20101203/ippTools/src/regtool.c
===================================================================
--- /branches/czw_branch/20101203/ippTools/src/regtool.c	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/src/regtool.c	(revision 29982)
@@ -331,4 +331,5 @@
 
   psString previous_uri = NULL;
+  psString this_uri = NULL;
   bool ok_to_burn = true;
   bool already_burned = true;
@@ -340,8 +341,14 @@
     psMetadata *row = output->data[i];
 
-    // Use tmp_class_id because class_id may not be populated for all imfiles
+    // Add the information about this row and the previous, if it exists.
+    // Write the class_id stuff for debugging.
     this_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
     psStringSubstitute(&this_class_id,"XY","ota");
-    // Determine if we've crossed a class_id boundary.
+    psMetadataAddStr(row,PS_LIST_TAIL,"this_class_id",PS_META_REPLACE,"",this_class_id);
+    if (previous_class_id) {
+      psMetadataAddStr(row,PS_LIST_TAIL,"previous_class_id",PS_META_REPLACE,"",previous_class_id);
+    }
+    
+    // Determine if we've crossed a class_id boundary, as this resets the bits.
     if (previous_class_id) {
       if (strcmp(this_class_id,previous_class_id) != 0) {
@@ -352,16 +359,12 @@
     }
 
-    // If the state of this imfile is not "pending_burntool" then skip it, because 
-    if (!ignore_state) {
-      psString imfile_state = psMetadataLookupStr(NULL,row,"imfile_state");
-
-      if (!imfile_state) {
-	continue;
-      }
-      if (strcmp("pending_burntool",imfile_state) != 0) {
-	continue;
-      }
-    }
-    
+    // Write the URIs as well.
+    this_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Duplicate, but helpful for my debugging.
+    psMetadataAddStr(row,PS_LIST_TAIL,"this_uri",PS_META_REPLACE,"",this_uri); 
+    if (previous_uri) {
+      psMetadataAddStr(row,PS_LIST_TAIL,"previous_uri",PS_META_REPLACE,"",previous_uri);
+    }
+
+    // Check the two status variables
     // Convert bits of the SQL query into booleans describing the data state
     if ((psMetadataLookupS32(NULL,row,"is_downloaded") != 1)||
@@ -381,29 +384,66 @@
     psMetadataAddBool(row,PS_LIST_TAIL,"already_burned",PS_META_REPLACE,"",already_burned);
 
-    // We'll need to return the previous uri so we know where the input table is:
-    if (previous_uri) {
-      psMetadataAddStr(row,PS_LIST_TAIL,"previous_uri",PS_META_REPLACE,"",previous_uri);
-      psFree(previous_uri);
-    }
-    previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri"));
-
-    // Write the class_id stuff at the end for debugging.
-    psMetadataAddStr(row,PS_LIST_TAIL,"this_class_id",PS_META_REPLACE,"",this_class_id);
-    if (previous_class_id) {
-      psMetadataAddStr(row,PS_LIST_TAIL,"previous_class_id",PS_META_REPLACE,"",previous_class_id);
-      psFree(previous_class_id);
-    }
-    // Use tmp_class_id because class_id may not be populated for all imfiles
-    previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
-    psStringSubstitute(&previous_class_id,"XY","ota");
+    // Check the uri for this exposure
+    if (!this_uri) {
+	ok_to_burn = false;
+	already_burned = false;
+
+	// Save this round for next round.
+	psFree(previous_class_id);
+	psFree(previous_uri);
+	previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
+	psStringSubstitute(&previous_class_id,"XY","ota");
+	previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.	
+	continue;
+    }      
+
+    //    printf("STATUS: %s %s %s %s (%d %d)\n",this_uri,previous_uri,this_class_id,previous_class_id,ok_to_burn,already_burned);
+
+    // If the state of this imfile is not "pending_burntool" then we can't burn it. 
+    if (!ignore_state) {
+      psString imfile_state = psMetadataLookupStr(NULL,row,"imfile_state");
+
+      if (!imfile_state) { // imfile state is NULL, so we probably aren't registered.
+	ok_to_burn = false;
+
+	// Save this round for next round.
+	psFree(previous_class_id);
+	psFree(previous_uri);
+	previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
+	psStringSubstitute(&previous_class_id,"XY","ota");
+	previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.	
+	continue;
+      }
+      if (strcmp("pending_burntool",imfile_state) != 0) { // Probably the state is full, do not twiddle states	
+	// Save this round for next round.
+	psFree(previous_class_id);
+	psFree(previous_uri);
+	previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
+	psStringSubstitute(&previous_class_id,"XY","ota");
+	previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.	
+	continue;
+      }
+    }
+    
     // Determine if we've already suggested an entry for this ota, and if not, copy this
     // suggestion into our output result list.
     if (!ok_to_burn || already_burned) {
+      // Save this round for next round.
+      psFree(previous_class_id);
+      psFree(previous_uri);
+      previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
+      psStringSubstitute(&previous_class_id,"XY","ota");
+      previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.	      
       continue;
     }
-    
+    // If we're here, then we think we could potentially burntool this file.
     psArrayAdd(results,results->n,row);
-    // If we're here, then we think we could potentially burntool this file.
-
+
+    // Save this round for next round.
+    psFree(previous_class_id);
+    psFree(previous_uri);
+    previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
+    psStringSubstitute(&previous_class_id,"XY","ota");
+    previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.	      
   }
   
@@ -499,5 +539,5 @@
     PXOPT_LOOKUP_S32(bytes, config->args,  "-bytes", false, false);
     PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false);
-    PXOPT_LOOKUP_Bool(video_cells, config->args, "-video_cells", false, false);
+    PXOPT_LOOKUP_BOOL(video_cells, config->args, "-video_cells", false);
     
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
@@ -1060,4 +1100,7 @@
     PXOPT_LOOKUP_F32(moon_phase, config->args, "-moon_phase", false, false);
     PXOPT_LOOKUP_STR(label,  config->args, "-label", false, false);
+    PXOPT_LOOKUP_STR(data_group,  config->args, "-data_group", false, false);
+    PXOPT_LOOKUP_STR(dist_group,  config->args, "-dist_group", false, false);
+    PXOPT_LOOKUP_STR(chip_workdir,config->args, "-chip_workdir", false, false);
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
 
@@ -1259,13 +1302,13 @@
     // else continue on...
 
-
+    chip_workdir = chip_workdir ? chip_workdir : workdir;
     // insert an entry into the chipPendingExp table
     // this can only be run as the newExp's state has been set to stop
     if (!pxchipQueueByExpTag(config,
                 exp_id,
-                workdir,
+			     chip_workdir,
                 label,
-                NULL,       // data_group
-                NULL,       // dist_group
+			     data_group,
+			     dist_group,
                 reduction,
                 NULL,       // expgroup
Index: /branches/czw_branch/20101203/ippTools/src/regtoolConfig.c
===================================================================
--- /branches/czw_branch/20101203/ippTools/src/regtoolConfig.c	(revision 29981)
+++ /branches/czw_branch/20101203/ippTools/src/regtoolConfig.c	(revision 29982)
@@ -268,4 +268,7 @@
     ADD_OPT(F32,  addprocessedexpArgs, "-moon_phase",       "define moon phase (0.0 = new)",   NAN);
     ADD_OPT(Str,  addprocessedexpArgs, "-label",            "define label for chip stage (non-detrend data only)", NULL);
+    ADD_OPT(Str,  addprocessedexpArgs, "-data_group",       "define data_group for chip stage (non-detrend data only)", NULL);
+    ADD_OPT(Str,  addprocessedexpArgs, "-dist_group",       "define dist_group for chip stage (non-detrend data only)", NULL);
+    ADD_OPT(Str,  addprocessedexpArgs, "-chip_workdir",     "define workdir for chip stage (non-detrend data only)", NULL);
     ADD_OPT(Str,  addprocessedexpArgs, "-hostname",         "define host name", NULL);
     ADD_OPT(S16,  addprocessedexpArgs, "-fault",             "set fault code", 0);