Changeset 4816

Timestamp:

Mar 16, 2009, 3:15:37 PM (14 years ago)

Author:

Martin Svensson

Message:

References #1240 The item-overview tree is now using lazy loading. The other parts of the ticket (eg. validation and buttons) are not yet covered and probably not fully functional at the moment.

Location:

trunk

Files:

• src/core/net/sf/basedb/util/overview/validator/DataFileValidator.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/overview/validator/ExperimentValidator.java (modified) (1 diff)
• src/core/net/sf/basedb/util/overview/validator/RawBioAssayValidator.java (modified) (1 diff)
• www/common/overview/ajax.jsp (added)
• www/common/overview/index.jsp (modified) (2 diffs)
• www/common/overview/tree.jsp (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/overview/validator/DataFileValidator.java

@@ -86 +86 @@
     // or the actual parent (for a single file)
     FileStoreEnabled parentItem = (FileStoreEnabled)(parentNode.getNodeType() == Node.Type.FOLDER ? 
-        parentNode.getParent().getItem() : parentNode.getItem());
+        parentNode.getParent().getItem() : parentNode.getItem(dc));
     
     // Check that we have access to the file and it's file type
@@ -191 +191 @@
   {
     super.postValidateFolder(dc, context, folderNode, parentNode);
-    FileStoreEnabled parentItem = (FileStoreEnabled)parentNode.getItem();
+    FileStoreEnabled parentItem = (FileStoreEnabled)parentNode.getItem(dc);
     
     // Check that we have linked a file for all file types that

trunk/src/core/net/sf/basedb/util/overview/validator/ExperimentValidator.java

@@ -62 +62 @@
     if (project != null)
     {
+      project = Project.getById(dc, project.getId());
       RawDataType projectDefault = project.getDefaultRawDataType();
       if (projectDefault != null && experiment.getRawDataType() != projectDefault)

trunk/src/core/net/sf/basedb/util/overview/validator/RawBioAssayValidator.java

@@ -73 +73 @@
     if (project != null)
     {
+      project = Project.getById(dc, project.getId());
       RawDataType projectDefault = project.getDefaultRawDataType();
       if (projectDefault != null && rba.getRawDataType() != projectDefault)

trunk/www/common/overview/index.jsp

@@ -65 +65 @@
         null : Project.getById(dc, sc.getActiveProjectId());
     GenericOverview overview = OverviewUtil.getNewOrCurrentOverview(dc, item, project);
-    overview.expand(dc, overview.getRootNode(), true);
+    overview.expand(dc, overview.getRootNode(), false);
     overview.updateFailureCountOnNodes();
     dc.close();
@@ -78 +78 @@
     Project project = sc.getActiveProjectId() == 0 ? 
         null : Project.getById(dc, sc.getActiveProjectId());
-    GenericOverview overview = OverviewUtil.getNewOverview(dc, item, project);
-    overview.expand(dc, overview.getRootNode(), true);
+    GenericOverview overview = OverviewUtil.getNewOverview(dc, item, project);    
+    overview.expand(dc, overview.getRootNode(), false);
+    System.out.print("test");
     overview.updateFailureCountOnNodes();
     dc.close();

trunk/www/common/overview/tree.jsp

@@ -107 +107 @@
     int numChildren = child.getChildren() == null ? 
       0 : child.getChildren().size();
-    sb.append("var node").append(child.hashCode()).append(" = JoustMenu.addChildItem(").append("node"+startNode.hashCode());
+    sb.append("var node").append(child.hashCode()).append(" = JoustMenu.addLazyChildItem(").append("node"+startNode.hashCode());
     sb.append(",'").append(folderIcon).append("'");
     sb.append(",'").append(HTML.javaScriptEncode(child.getTitle()));
     sb.append(child.getNodeType() == Node.Type.FOLDER ? " (" + numChildren + ")" : "").append("',");
-    sb.append("'showInfo(\"").append(child.getId()).append("\")','").append(HTML.javaScriptEncode(tooltip)).append("', '").append(child.getId()).append("')\n");
+    sb.append("'showInfo(\"").append(child.getId()).append("\")','").append(HTML.javaScriptEncode(tooltip)).append("', '").append(child.getId()).append("',");
+    sb.append("'lazyInitSubNode(").append(child.hashCode()).append(")')\n");
     sb.append(generateSubTree(child, ID));
   }
@@ -139 +140 @@
   %>
   <base:page title="" type="popup">
-  <base:head scripts="newjoust.js" styles="newjoust.css">
+  <base:head scripts="newjoust.js,ajax.js" styles="newjoust.css">
   <script language="JavaScript">
   var isInitialised = false;
@@ -225 +226 @@
     }
   }
+
+  function lazyInitSubNode(nodeId)
+  {
+    var request = Ajax.getXmlHttpRequest();
+    var url = 'ajax.jsp?ID=<%=ID%>&cmd=GetSubNodes&node_id=' + nodeId;
+    request.open("GET", url, false);
+    request.send(null);
+    var response = request.responseText.split('\n');
+
+    var kv = new Array();
+    var numAdded = 0;
+    var parent = JoustMenu.menuItems['N' + nodeId];
+    for (var i=0; i<response.length; i++)
+    {
+      var txt = Main.trimString(response[i]);     
+      if (txt == 'end')
+      {
+        var id = kv['id'];
+        numAdded++;
+        JoustMenu.addLazyChildItem(parent.index, kv['folderIcon'], kv['title'], 'showInfo(\''+id+'\')', kv['tooltip'], id, 'lazyInitSubNode('+kv['hashCode']+')');
+      }
+      else
+      {
+        var tmp = txt.split('\t', 2);
+        kv[tmp[0]] = tmp[1];
+      }
+    }
+    //alert(numAdded);
+    return numAdded > 0;          
+  }
   </script>
   </base:head>