Changeset 1098

Timestamp:

May 28, 2009, 11:10:01 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #220: MeV doesn't download files correctly

Added the file id and last update time to the exported filename. This seems make the cache work as expected and cause a re-download if the file has been updated.

Location:

extensions/net.sf.basedb.mev/trunk

Files:

• resources/mev_jnlp.jsp (modified) (3 diffs)
• src/net/sf/basedb/mev/servlet/MevExport.java (modified) (2 diffs)

extensions/net.sf.basedb.mev/trunk/resources/mev_jnlp.jsp

@@ -30 +30 @@
   session="false"
   import="net.sf.basedb.core.SessionControl"
+  import="net.sf.basedb.core.DbControl"
+  import="net.sf.basedb.core.BioAssaySet"
+  import="net.sf.basedb.core.File"
+  import="net.sf.basedb.core.FileStoreUtil"
+  import="net.sf.basedb.core.ItemNotFoundException"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
@@ -48 +53 @@
 final String fullHomeUrl = scheme + "://" + serverName + ":" + serverPort + homeUrl;
 final int jvmMaxMemory = Values.getInt(sc.getUserClientSetting("net.sf.basedb.mev.launchmev.jvm.maxmemory"), 512);
+String extraFileName = "";
+DbControl dc = sc.newDbControl();
+try
+{
+  BioAssaySet bas = BioAssaySet.getById(dc, bioAssaySetId);
+  File mevFile = FileStoreUtil.getDataFile(dc, bas, fileType);
+  
+  if (mevFile == null)
+  {
+    throw new ItemNotFoundException("No " + fileType + " file found on bioassay set: " + 
+      bas.getName());
+  }
+  extraFileName = "-" + mevFile.getId() + "." + mevFile.getLastUpdate().getTime();
+}
+finally
+{
+  if (dc != null) dc.close();
+}
 out.clearBuffer();
 %><?xml version="1.0" encoding="UTF-8"?>
@@ -125 +148 @@
     <argument><%=mevFileType%></argument>
     <argument>-fileUrl</argument>
-    <argument><%=fullHomeUrl%>/MevExport/<%=ID%>/<%=bioAssaySetId%>/<%=fileType%>.servlet</argument>
+    <argument><%=fullHomeUrl%>/MevExport/<%=ID%>/<%=bioAssaySetId%>/<%=fileType%><%=extraFileName%>.servlet</argument>
   </application-desc>
 </jnlp>

extensions/net.sf.basedb.mev/trunk/src/net/sf/basedb/mev/servlet/MevExport.java

@@ -78 +78 @@
       {
         // Parameters are given as path: /ID/bioassayset_id/filetype
+        // filetype may optionally end with '-some extra info'
         String[] path = request.getPathInfo().split("/");
         ID = path[path.length-3];
         bioAssaySetId = Values.getInt(path[path.length-2]);
         fileType = path[path.length-1];
+        int extraInfo = fileType.lastIndexOf('-');
+        if (extraInfo >= 0) fileType = fileType.substring(0, extraInfo);
       }
       final SessionControl sc = Application.getSessionControl(ID, request.getRemoteAddr());
@@ -99 +102 @@
       OutputStream out = response.getOutputStream();
       response.setContentType("text/plain");
+      if (mevFile.getLastUpdate() != null)
+      {
+        response.setDateHeader("Last-Modified", mevFile.getLastUpdate().getTime());
+      }
       if (mevFile.getSize() < Integer.MAX_VALUE)
       {