Changeset 20787

Timestamp:

03/03/10 16:44:00 (2 years ago)

Author:

julie

Message:

log error and return null when error is encountered rendering a widget

File:

• trunk/intermine/web/main/src/org/intermine/dwr/AjaxServices.java (modified) (6 diffs)

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

@@ -91 +91 @@
 import org.intermine.web.logic.widget.EnrichmentWidget;
 import org.intermine.web.logic.widget.GraphWidget;
-import org.intermine.web.logic.widget.GridWidget;
 import org.intermine.web.logic.widget.HTMLWidget;
 import org.intermine.web.logic.widget.TableWidget;
 import org.intermine.web.logic.widget.config.EnrichmentWidgetConfig;
 import org.intermine.web.logic.widget.config.GraphWidgetConfig;
-import org.intermine.web.logic.widget.config.GridWidgetConfig;
 import org.intermine.web.logic.widget.config.HTMLWidgetConfig;
 import org.intermine.web.logic.widget.config.TableWidgetConfig;
@@ -147 +145 @@
             processException(e);
         }
+    }
+
+    private static void processWidgetException(Exception e, String widgetId) {
+        String msg = "Failed to render widget: " + widgetId;
+        LOG.error(msg, e);
     }
 
@@ -784 +787 @@
             }
         } catch (RuntimeException e) {
-            processException(e);
+            processWidgetException(e, widgetId);
         }
         return null;
@@ -817 +820 @@
             }
         } catch (RuntimeException e) {
-            processException(e);
+            processWidgetException(e, widgetId);
         }
         return null;
@@ -854 +857 @@
             }
         } catch (RuntimeException e) {
-            processException(e);
+            processWidgetException(e, widgetId);
         }
         return null;
@@ -900 +903 @@
             }
         } catch (RuntimeException e) {
-            processException(e);
-        }
-        return null;
-    }
-
-    /**
-     *
-     * @param widgetId unique ID for each widget
-     * @param bagName name of list
-     * @param highlight for highlighting
-     * @param pValue pValue
-     * @param numberOpt numberOpt
-     * @param externalLink link to external datasource
-     * @param externalLinkLabel name of external datasource.
-     * @return enrichment widget
-     */
-    public static GridWidget getProcessGridWidget(String widgetId, String bagName,
-            String highlight, String pValue, String numberOpt, String externalLink,
-            String externalLinkLabel) {
-        try {
-            ServletContext servletContext = WebContextFactory.get().getServletContext();
-            HttpSession session = WebContextFactory.get().getSession();
-            final InterMineAPI im = SessionMethods.getInterMineAPI(session);
-            WebConfig webConfig = SessionMethods.getWebConfig(servletContext);
-            ObjectStore os = im.getObjectStore();
-            Model model = os.getModel();
-            Profile profile = SessionMethods.getProfile(session);
-            BagManager bagManager = im.getBagManager();
-
-            InterMineBag imBag = bagManager.getUserOrGlobalBag(profile, bagName);
-            Type type = webConfig.getTypes().get(model.getPackageName()
-                    + "." + imBag.getType());
-            List<WidgetConfig> widgets = type.getWidgets();
-            for (WidgetConfig widgetConfig : widgets) {
-                if (widgetConfig.getId().equals(widgetId)) {
-                    GridWidgetConfig gridWidgetConfig = (GridWidgetConfig) widgetConfig;
-                    gridWidgetConfig.setExternalLink(externalLink);
-                    gridWidgetConfig.setExternalLinkLabel(externalLinkLabel);
-                    GridWidget gridWidget = new GridWidget(gridWidgetConfig, imBag, os, null,
-                            highlight, pValue, numberOpt);
-                    return gridWidget;
-                }
-            }
-        } catch (RuntimeException e) {
-            processException(e);
+            processWidgetException(e, widgetId);
         }
         return null;