Changeset 20752

Timestamp:

01/03/10 10:13:04 (2 years ago)

Author:

julie

Message:

added missing arguments

Location:

trunk

Files:

• bio/webapp/src/org/intermine/bio/web/logic/OrthologueConverter.java (modified) (3 diffs)
• intermine/web/main/src/org/intermine/web/struts/PortalQueryAction.java (modified) (3 diffs)

trunk/bio/webapp/src/org/intermine/bio/web/logic/OrthologueConverter.java

@@ -38 +38 @@
 {
 
-    
+
     // D. melanogaster, C. lupus familiaris
     private static final Pattern ORGANISM_SHORTNAME_MATCHER = Pattern.compile("([a-zA-Z]\\..+)");
     private Model model;
-    
+
 
     /**
@@ -58 +58 @@
 
         // organism
-        q.addConstraint("Gene.homologues.homologue.organism.shortName", 
+        q.addConstraint("Gene.homologues.homologue.organism.shortName",
                 Constraints.eq(organismName));
 
@@ -98 +98 @@
         return orthologues.toString();
     }
-    
+
     /**
      * runs the orthologue conversion pathquery and returns list of intermine IDs

trunk/intermine/web/main/src/org/intermine/web/struts/PortalQueryAction.java

@@ -171 +171 @@
                 if (addparameters.length > 0) {
 
-                    BagConverter bagConverter = getBagConverter(converterClassName);
+                    BagConverter bagConverter = getBagConverter(im, webConfig, converterClassName);
 
                     imBag = profile.createBag(bagName, className, "");
@@ -215 +215 @@
     }
 
-    private BagConverter getBagConverter(String converterClassName) {
+    private BagConverter getBagConverter(InterMineAPI im, WebConfig webConfig, 
+            String converterClassName) {
 
         BagConverter bagConverter = bagConverters.get(converterClassName);
@@ -223 +224 @@
                 Class clazz = Class.forName(converterClassName);
                 Constructor constructor = clazz.getConstructor();
-                bagConverter = (BagConverter) constructor.newInstance();
+                bagConverter = (BagConverter) constructor.newInstance(im, webConfig);
             } catch (Exception e) {
                 throw new RuntimeException("Failed to construct bagconverter for "