Changeset 22801

Timestamp:

08/09/10 15:35:13 (17 months ago)

Author:

contrino

Message:

modmine web: now categories obtained from chado. old code to be removed after build.

Location:

trunk/modmine/webapp/src/org/modmine/web

Files:

• DisplayExperiment.java (modified) (3 diffs)
• ProjectsSummaryController.java (modified) (4 diffs)

trunk/modmine/webapp/src/org/modmine/web/DisplayExperiment.java

@@ -49 +49 @@
     private ObjectStore os;
     private String experimentType;
+    private String experimentCategory;
     private Set<String> labs = new TreeSet<String>();
     private String piSurname;
@@ -94 +95 @@
 
         this.experimentType = StringUtil.prettyList(expTypes);
+
+        this.experimentCategory = exp.getCategory();
 
         for (Organism organism : proj.getOrganisms()) {
@@ -315 +318 @@
 
     /**
+     * @return the experimentType
+     */
+    public String getExperimentCategory() {
+        return experimentCategory;
+    }
+
+    /**
      * @return the labs
      */

trunk/modmine/webapp/src/org/modmine/web/ProjectsSummaryController.java

@@ -11 +11 @@
  */
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25 +26 @@
 import org.apache.struts.tiles.actions.TilesAction;
 import org.intermine.api.InterMineAPI;
+import org.intermine.bio.util.BioConverterUtil;
 import org.intermine.objectstore.ObjectStore;
 import org.intermine.web.logic.session.SessionMethods;
@@ -42 +44 @@
             HttpServletRequest request,
             @SuppressWarnings("unused") HttpServletResponse response)
-        throws Exception {
+    throws Exception {
         try {
             final InterMineAPI im = SessionMethods.getInterMineAPI(request.getSession());
@@ -54 +56 @@
             request.setAttribute("tracks", tracks);
 
-            final ServletContext servletContext = servlet.getServletContext();
+            //            final ServletContext  = servlet.getServletContext();
+            //          Map<String, List<DisplayExperiment>> categories =
+            //          CategoryExperiments.getCategoryExperiments(servletContext, os);
+            //      request.setAttribute("catExp", categories);
 
-            Map<String, List<DisplayExperiment>> categories =
-                CategoryExperiments.getCategoryExperiments(servletContext, os);
-//            request.setAttribute("categories", categories);
-            request.setAttribute("catExp", categories);
+
+            // using the categories form experiment.category (chado)
+            Map<String, List<DisplayExperiment>> categoriesNew = 
+                new HashMap<String, List<DisplayExperiment>>();
+
+            for (List<DisplayExperiment> expList : experiments.values()) {
+                for (DisplayExperiment exp : expList) {
+                    BioConverterUtil.addToListMap(categoriesNew, exp.getExperimentCategory(), exp);
+                }
+            }
+            request.setAttribute("catExp", categoriesNew);
 
         } catch (Exception err) {