Changeset 3822

Timestamp:

Oct 12, 2007, 12:27:14 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #801: Code for the "Recently viewed items" menu is unstable when data is in an unexpected format

Location:

branches/2.4-stable

Files:

• src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (1 diff)
• www/include/menu.jsp (modified) (2 diffs)

branches/2.4-stable/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -395 +395 @@
       
       // Current item
-      String itemId = request.getParameter("item_id");
+      String itemId = Values.getStringOrNull(request.getParameter("item_id"));
       cc.setId(Values.getInt(itemId, cc.getId()));
       

branches/2.4-stable/www/include/menu.jsp

@@ -106 +106 @@
         for (String recent : recentlyViewed)
         {
-          String[] tmp = recent.split("=");
-          Item itemType = Item.valueOf(tmp[0]);
-          int itemId = Values.getInt(tmp[1], 0);
-          if (itemId != 0)
+          try
           {
-            String shortName = "";
-            String fullName = "";
-            if (loadNames)
+            String[] tmp = recent.split("=");
+            Item itemType = Item.valueOf(tmp[0]);
+            int itemId = Values.getInt(tmp[1], 0);
+            if (itemId != 0)
             {
-              try
+              String shortName = "";
+              String fullName = "";
+              if (loadNames)
               {
-                BasicItem item = itemType.getById(dc, itemId);
-                fullName = ((Nameable)item).getName();
-                shortName = HTML.encodeTags(StringUtil.trimString(fullName, 35));
+                try
+                {
+                  BasicItem item = itemType.getById(dc, itemId);
+                  fullName = ((Nameable)item).getName();
+                  shortName = HTML.encodeTags(StringUtil.trimString(fullName, 35));
+                }
+                catch (Throwable t)
+                {
+                  continue;
+                }
               }
-              catch (Throwable t)
+              else
               {
-                continue;
+                fullName = itemType.toString() + "; id=" + itemId;
+                shortName = itemType + " (id=" + itemId + ")";
               }
+              numItems++;
+              %>
+              <m:menuitem
+                title="<%=numItems + ". " + shortName%>"
+                onclick="<%="Main.viewOrEditItem('" + ID + "', '" + itemType.name() + "', " + itemId + ")"%>"
+                tooltip="<%="Go to " + HTML.encodeTags(fullName) + " (" + itemType + ")"%>"
+              />
+              <%
             }
-            else
-            {
-              fullName = itemType.toString() + "; id=" + itemId;
-              shortName = itemType + " (id=" + itemId + ")";
-            }
-            numItems++;
-            %>
-            <m:menuitem
-              title="<%=numItems + ". " + shortName%>"
-              onclick="<%="Main.viewOrEditItem('" + ID + "', '" + itemType.name() + "', " + itemId + ")"%>"
-              tooltip="<%="Go to " + HTML.encodeTags(fullName) + " (" + itemType + ")"%>"
-            />
-            <%
           }
+          catch (Throwable t)
+          {}
         }
       }
@@ -162 +167 @@
         for (String recentItem : stickyItems.split(":"))
         {
-          Item itemType = Item.valueOf(recentItem);
-          ItemContext cc = sc.getCurrentContext(itemType);
-          if (cc.getId() != 0)
+          try
           {
-            String shortName = "";
-            String fullName = "";
-            if (loadNames)
+            Item itemType = Item.valueOf(recentItem);
+            ItemContext cc = sc.getCurrentContext(itemType);
+            if (cc.getId() != 0)
             {
-              try
+              String shortName = "";
+              String fullName = "";
+              if (loadNames)
               {
-                BasicItem item = itemType.getById(dc, cc.getId());
-                fullName = ((Nameable)item).getName();
-                shortName = ": " + HTML.encodeTags(StringUtil.trimString(fullName, 30));
+                try
+                {
+                  BasicItem item = itemType.getById(dc, cc.getId());
+                  fullName = ((Nameable)item).getName();
+                  shortName = ": " + HTML.encodeTags(StringUtil.trimString(fullName, 30));
+                }
+                catch (Throwable t)
+                {
+                  continue;
+                }
               }
-              catch (Throwable t)
+              else
               {
-                continue;
+                fullName = itemType.toString() + "; id=" + cc.getId();
+                shortName = " (id=" + cc.getId() + ")";
+              }
+              numItems++;
+              numSticky++;
+              %>
+              <m:menuitem
+                title="<%=itemType + shortName%>"
+                onclick="<%="Main.viewOrEditItem('" + ID + "', '" + itemType.name() + "', " + cc.getId() + ")"%>"
+                tooltip="<%="Go to " + HTML.encodeTags(fullName) + " (" + itemType + ")"%>"
+              />
+              <%
+              if (itemType == Item.BIOASSAYSET)
+              {
+                // Add menu for Experiment explorer as well
+                %>
+                <m:menuitem
+                  title="<%="Experiment explorer"+HTML.encodeTags(shortName)%>"
+                  onclick="<%="location.href = '"+root+"views/experiments/explorer/view/index.jsp?ID=" + ID + "&bioassayset_id="+cc.getId()+"'"%>"
+                  tooltip="Go to experiment explorer"
+                />
+                <%
               }
             }
-            else
-            {
-              fullName = itemType.toString() + "; id=" + cc.getId();
-              shortName = " (id=" + cc.getId() + ")";
-            }
-            numItems++;
-            numSticky++;
-            %>
-            <m:menuitem
-              title="<%=itemType + shortName%>"
-              onclick="<%="Main.viewOrEditItem('" + ID + "', '" + itemType.name() + "', " + cc.getId() + ")"%>"
-              tooltip="<%="Go to " + HTML.encodeTags(fullName) + " (" + itemType + ")"%>"
-            />
-            <%
-            if (itemType == Item.BIOASSAYSET)
-            {
-              // Add menu for Experiment explorer as well
-              %>
-              <m:menuitem
-                title="<%="Experiment explorer"+HTML.encodeTags(shortName)%>"
-                onclick="<%="location.href = '"+root+"views/experiments/explorer/view/index.jsp?ID=" + ID + "&bioassayset_id="+cc.getId()+"'"%>"
-                tooltip="Go to experiment explorer"
-              />
-              <%
-            }
           }
+          catch (Throwable t)
+          {}
         }
         if (numSticky == 0)