Changeset 20767

Timestamp:

02/03/10 15:56:21 (2 years ago)

Author:

julie

Message:

fixed null pointer error.

Location:

trunk

Files:

• bio/webapp/src/org/intermine/bio/web/logic/OrthologueConverter.java (modified) (1 diff)
• intermine/web/main/src/org/intermine/dwr/AjaxServices.java (modified) (2 diffs)
• intermine/web/main/src/org/intermine/web/logic/PortalHelper.java (modified) (1 diff)
• intermine/webapp/main/resources/webapp/js/imdwr.js (modified) (1 diff)

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

@@ -73 +73 @@
     public String getConvertedObjectFields(Profile profile, String bagType, String bagName,
             String organismName) {
-        StringBuffer orthologues = null;
+        StringBuffer orthologues = new StringBuffer();
         PathQuery pathQuery = constructPathQuery(organismName);
         pathQuery.addConstraint(bagType, Constraints.in(bagName));

trunk/intermine/web/main/src/org/intermine/dwr/AjaxServices.java

@@ -1341 +1341 @@
      * @throws UnsupportedEncodingException bad encoding
      */
-    public String convertObjects(String bagType, String bagName, String selectedValue) 
+    public String convertObjects(String bagType, String bagName, String param, 
+            String selectedValue) 
     throws UnsupportedEncodingException {
         ServletContext servletContext = WebContextFactory.get().getServletContext();
@@ -1357 +1358 @@
         if (additionalConverters != null) {
             for (String converterClassName : additionalConverters.keySet()) {
-
-                String addparameter = PortalHelper.getAdditionalParameter(request,
+                String addparameter = PortalHelper.getAdditionalParameter(param,
                         additionalConverters.get(converterClassName));
-
                 if (StringUtils.isNotEmpty(addparameter)) {
-
                     BagConverter bagConverter = portalHelper.getBagConverter(im, webConfig, 
                             converterClassName);
-
-
                 return bagConverter.getConvertedObjectFields(profile, bagType, bagName,
                         selectedValue);

trunk/intermine/web/main/src/org/intermine/web/logic/PortalHelper.java

@@ -33 +33 @@
 
     private static Map<String, BagConverter> bagConverters = new HashMap();
+    
+    public static String getAdditionalParameter(String param, String[] paramArray) {
+
+        String[] urlFields = paramArray[0].split(",");
+        for (String urlField : urlFields) {
+            // if one of the request vars matches the variables listed in the bagquery
+            // config, add the variable to be passed to the custom converter
+            
+            if (urlField.equals(param)) {
+                // the spaces in organisms, eg. D.%20rerio, need to be handled
+                return param;
+            }
+        }
+        return null;
+    }
     
     public static String getAdditionalParameter(HttpServletRequest request, String[] paramArray)

trunk/intermine/webapp/main/resources/webapp/js/imdwr.js

@@ -803 +803 @@
     // convert orthologues then post
     if (myForm.orthologueMapping[1].checked) {
-
         // convert orthologues
-        AjaxServices.convertObjects(bagType, bagName, selectedOrganism, function(identifiers) {
+        AjaxServices.convertObjects(bagType, bagName, 'orthologue', selectedOrganism, function(identifiers) {
             if (identifiers != null && identifiers != '') {
                 myForm.externalids.value = identifiers;