fixing issue with bids_import duplication of labels - LORIS-MRI/aces#763

jeffersoncasimir · Feb 15, 2022 · 681d82f · 681d82f
1 parent 43c1b25
commit 681d82f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/php/annotations.class.inc b/php/annotations.class.inc
@@ -125,7 +125,7 @@ class Annotations extends \NDB_Page
             ];
 
             $instance_id   = $parameters['instance_id'] ? 
-                (int) $parameters['instance_id'] :  null;
+                 intval($parameters['instance_id']) :  null;
             // ##################### EEGNET OVERRIDE END ################## //
             $parameter_id  = $parameters['parameter_id'] ?? null;
 
@@ -137,8 +137,11 @@ class Annotations extends \NDB_Page
             if (is_null($instance_id)) {
                 $instance_id = $db->pselectOne(
                     "SELECT MAX(AnnotationInstanceID) 
-                    FROM physiological_annotation_instance",
-                    []
+                    FROM physiological_annotation_instance ai
+                    JOIN physiological_annotation_file af USING (AnnotationFileID)
+                    WHERE PhysiologicalFileID=:physioFileID
+                    ",
+                    ['physioFileID' => $parameters['physioFileID']]
                 );
             }
 

diff --git a/php/models/electrophysioannotations.class.inc b/php/models/electrophysioannotations.class.inc
@@ -100,9 +100,14 @@ class ElectrophysioAnnotations
             //If the label is new, add to annotation label table
             //and get label ID
             $labelID = $db->pselectOne(
-                "SELECT AnnotationLabelID
+                // ##################### EEGNET OVERRIDE START ################## //
+                // Adding MAX here as a hack fix for now until LORIS-MRI 
+                // bugfix for issue https://github.com/aces/Loris-MRI/issues/763 
+                // is available and cleanup happens of the annotation_label table 
+                "SELECT MAX(AnnotationLabelID)
                     FROM physiological_annotation_label
                     WHERE LabelName=:label",
+                // ##################### EEGNET OVERRIDE END ################## //
                 ['label' => $instance_data['label_name']]
             );
             if (empty($labelID)) {