Fix file count in mri_upload when deleting a minc file and then re-in…

…serting (#180)

uploadNeuroDB/minc_deletion.pl

@@ -330,3 +330,27 @@ sub selORdel {
 
 # Delete file records last
 selORdel("files","File");
+
+# Update the number of minc inserted in mri_upload by subtracting one
+if ($selORdel eq "DELETE ") {
+    $query = "SELECT number_of_mincInserted FROM mri_upload " .
+        "WHERE TarchiveID=?";
+
+    $sth = $dbh->prepare($query);
+    $sth->execute($tarchiveid);
+    my $nmi = $sth->fetchrow_array;
+
+    if ($sth->rows > 0) {
+        my $new_nmi = $nmi - 1;
+        $query = "UPDATE mri_upload SET number_of_mincInserted=? ".
+            "WHERE TarchiveID=?";
+
+        $sth = $dbh->prepare($query);
+        my $success = $sth->execute($new_nmi, $tarchiveid);
+
+        if ($success) {
+            print "\nNew count for number of mincs inserted changed to " . $new_nmi . "\n";
+        }
+    }
+}
+

uploadNeuroDB/tarchiveLoader

@@ -509,7 +509,8 @@ $utility->computeSNR($tarchiveInfo{TarchiveID},
                          $tarchiveInfo{'SourceLocation'},
 			 $profile);
 ################################################################
-############### Compute SNR on 3D modalities ###################
+####### Add order of acquisition for similar modalities ########
+####### within the same session based on series number #########
 ################################################################
 $utility->orderModalitiesByAcq($tarchiveInfo{TarchiveID},
                          $tarchiveInfo{'SourceLocation'});
@@ -522,6 +523,19 @@ if ($valid_study) {
     ### And number_of_mincInserted #############################
     ############################################################
     my $where = "WHERE TarchiveID=?";
+
+    $query =
+        "SELECT number_of_mincInserted FROM mri_upload ";
+    $query = $query . $where;
+    if ($debug) {
+        print $query . "\n";
+    }
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute($tarchiveInfo{TarchiveID});
+    my $oldCount = $sth->fetchrow_array;
+    my $newCount = $minc_inserted + $oldCount;
+
     $query = "UPDATE mri_upload SET number_of_mincInserted=?, ".
                  "number_of_mincCreated=? ";
     $query = $query . $where;
@@ -531,7 +545,7 @@ if ($valid_study) {
 
     my $mri_upload_update = $dbh->prepare($query);
     $mri_upload_update->execute(
-               $minc_inserted,$mcount,$tarchiveInfo{TarchiveID}
+               $newCount,$mcount,$tarchiveInfo{TarchiveID}
     );
 
     ############################################################