Index: trunk/tools/runchipimfile.pl
===================================================================
--- trunk/tools/runchipimfile.pl	(revision 29756)
+++ trunk/tools/runchipimfile.pl	(revision 29757)
@@ -38,5 +38,5 @@
 
 my $query1 = "SELECT chipProcessedImfile.path_base, camera, exp_id, rawImfile.magicked AS raw_magicked, (rawImfile.user_1 is not NULL and rawImfile.user_1 > 0.5)  As deburned, chip_imfile_id, chipProcessedImfile.fault, rawImfile.uri, chipRun.reduction, chipRun.state";
-$query1 .= " FROM chipRun join chipProcessedImfile using(chip_id) JOIN chipImfile USING (chip_id, class_id) JOIN rawExp using(exp_id) JOIN rawImfile USING(exp_id) WHERE chip_id = $chip_id AND class_id = $class_id";
+$query1 .= " FROM chipRun join chipProcessedImfile using(chip_id,exp_id) JOIN chipImfile USING (chip_id, class_id) JOIN rawExp using(exp_id) JOIN rawImfile USING(exp_id, camera, class_id) WHERE chip_id = $chip_id AND class_id = '$class_id'";
 
 my $stmt1 = $dbh->prepare($query1);
@@ -55,6 +55,4 @@
 my $exp_id = $results->{exp_id};
 
-notdone
-
 die "cannot update database for a chip that is not faulted\n" if $update and !$fault;
 
@@ -71,8 +69,8 @@
     $state = 'update';
 } else {
-    die "unexpected warpRun.state found: $state\n";
+    die "unexpected chipRun.state found: $state\n";
 }
 
-my $command = "chip_imfile.pl --exp_id $exp_id --chip_id $chip_id --class_id $class_id --chip_imfile_id $chip_imfile_id --uri $uri --camera $camera --run-state $run_state --deburned $deburned --outroot $path_base" ;
+my $command = "chip_imfile.pl --exp_id $exp_id --chip_id $chip_id --chip_imfile_id $chip_imfile_id --class_id $class_id --uri $uri --camera $camera --run-state $run_state --deburned $deburned --outroot $path_base" ;
 
 $command .= " --magicked $magicked" if $magicked > 0;
@@ -83,5 +81,4 @@
 $command .= " --verbose" unless $no_verbose;
 $command .= " --dbname $dbname" if $dbname;
-
 
 if ($update) {