From 38e11cf5d5557bc4148d7f00a99eaaf9c01245c3 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Mon, 1 Feb 2016 16:37:38 +0100
Subject: [PATCH] Bugfix
---
.../java/org/hbp/mip/controllers/ModelsApi.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
index 1ef368d0a..371173644 100644
--- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
@@ -7,10 +7,7 @@ package org.hbp.mip.controllers;
import io.swagger.annotations.*;
import org.hbp.mip.MIPApplication;
-import org.hbp.mip.model.Dataset;
-import org.hbp.mip.model.Model;
-import org.hbp.mip.model.User;
-import org.hbp.mip.model.Variable;
+import org.hbp.mip.model.*;
import org.hbp.mip.utils.CSVUtil;
import org.hbp.mip.utils.HibernateUtil;
import org.hibernate.Query;
@@ -204,11 +201,23 @@ public class ModelsApi {
grps.add(v);
}
+ List<Filter> fltrs = new LinkedList<>();
+ for(Filter fltr : q.getFilters())
+ {
+ Filter f = new Filter();
+ f.setId(fltr.getId());
+ f.setOperator(fltr.getOperator());
+ f.setValues(fltr.getValues());
+ f.setVariable(fltr.getVariable());
+ fltrs.add(f);
+ }
+
org.hbp.mip.model.Query myQuery = new org.hbp.mip.model.Query();
myQuery.setId(q.getId());
myQuery.setVariables(vars);
myQuery.setCovariables(covs);
myQuery.setGrouping(grps);
+ myQuery.setFilters(fltrs);
model.setQuery(myQuery);
--
GitLab