Fix retrieval of analysis from associated data.

R/AnalysisHandle.R

@@ -36,11 +36,11 @@ AnalysisHandle <- R6Class(
     #' @param datafile A Datafile object
     #' @param data_as_input logical (default = FALSE), whether the data is an 
     #' input to the analysis workflow
-    #' @return An Analysis object
+    #' @return An Analysis object or a list of Analysis objects if data_as_input = TRUE
     get_by_data = function(datafile, data_as_input = FALSE) {
       if(data_as_input) {
         # Analyses that consumed this data
-        query <- "SELECT A.* FROM Analysis AS A, Analysis_has_Data AS AhD
+        query <- "SELECT DISTINCT A.* FROM Analysis AS A, Analysis_has_Data AS AhD
                   WHERE AhD.Parent_ID = ? AND AhD.Analysis_ID = A.ID"
         data <- self$dbConnection$get_data(query, list(screen$ID))
         if(length(data$ID)>0) {
@@ -62,7 +62,7 @@ AnalysisHandle <- R6Class(
       } else {
         # Analysis that produced this data.
         # There should be only one.
-        query <- "SELECT A.* FROM Analysis AS A, Analysis_has_Data AS AhD
+        query <- "SELECT DISTINCT A.* FROM Analysis AS A, Analysis_has_Data AS AhD
                   WHERE AhD.Child_ID = ? AND AhD.Analysis_ID = A.ID"
         df <- self$dbConnection$get_data(query, list(datafile$ID))
         if(length(df$ID) == 1) {

man/AnalysisHandle.Rd

@@ -85,7 +85,7 @@ input to the analysis workflow}
 \if{html}{\out{</div>}}
 }
 \subsection{Returns}{
-An Analysis object
+An Analysis object or a list of Analysis objects if data_as_input = TRUE
 }
 }
 \if{html}{\out{<hr>}}