Changeset 3852

Timestamp:

Oct 17, 2007, 9:58:57 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #721: Auto-detect function is now aware of FileStoreEnabled? items and automatically
selects a default file for import.

Location:

trunk/www/common

Files:

• import/select_file.jsp (modified) (6 diffs)
• plugin/configure.jsp (modified) (1 diff)

trunk/www/common/import/select_file.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.Job"
   import="net.sf.basedb.core.Location"
+  import="net.sf.basedb.core.FileStoreEnabled"
+  import="net.sf.basedb.core.FileSetMember"
+  import="net.sf.basedb.core.DataFileType"
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.core.query.Expressions"
@@ -53 +56 @@
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
-
 <%
 final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
@@ -64 +66 @@
 final String title = request.getParameter("title");
 final DbControl dc = sc.newDbControl();
+
 try
 {
+  // Try to get data files attached to FileStoreEnabled items
+  File currentFile = null;
+  List<FileSetMember> dataFiles = null;
+  if (FileStoreEnabled.class.isAssignableFrom(itemType.getItemClass()))
+  {
+    FileStoreEnabled fileStoreItem = null;
+    try
+    {
+      fileStoreItem = (FileStoreEnabled)itemType.getById(dc, currentContext.getId());
+    }
+    catch (Throwable t)
+    {}
+    if (fileStoreItem != null && fileStoreItem.hasFileSet())
+    {
+      dataFiles = fileStoreItem.getFileSet().getMembers().list(dc);
+      if (dataFiles.size() > 0)
+      {
+        // The first file will be selected by default
+        try
+        {
+          currentFile = dataFiles.get(0).getFile();
+        }
+        catch (Throwable t)
+        {}
+      }
+    }
+  }
   List<File> recentFiles = (List<File>)currentContext.getRecent(dc, Item.FILE);
   %>
-  <base:page type="popup" title="<%=title%>">
+  <%@page import="net.sf.basedb.core.RawBioAssay"%>
+<%@page import="net.sf.basedb.core.FileStoreUtil"%>
+<%@page import="net.sf.basedb.core.FileType"%>
+<%@page import="net.sf.basedb.core.FileStoreEnabled"%>
+<base:page type="popup" title="<%=title%>">
   <base:head>
     <script language="JavaScript">
@@ -103 +137 @@
       setFileCallback(selected.value, selected.text);
       frm.recentFile.selectedIndex = 0;
+    }
+    function dataFileOnChange()
+    {
+      var frm = document.forms['import'];
+      var selected = frm.dataFile[frm.dataFile.selectedIndex];
+      setFileCallback(selected.value, selected.text.replace(/\[.*\]\s/, ''));
+      frm.dataFile.selectedIndex = 0;
     }
     </script>
@@ -130 +171 @@
           <table border="0" cellspacing="0" cellpadding="0">
           <tr>
-          <td><input type="text" class="text required" name="path" size="60" value="">&nbsp;</td>
+          <td><input type="text" class="text required" name="path" size="60" 
+            value="<%=currentFile != null ? HTML.encodeTags(currentFile.getPath().toString()) : "" %>">&nbsp;</td>
           <td><base:button 
               title="Browse&hellip;"
@@ -140 +182 @@
         </td>
       </tr>
+      <%
+      if (dataFiles != null && dataFiles.size() > 0)
+      {
+        %>
+        <tr>
+          <td class="prompt">Data files</td>
+          <td>
+            <select name="dataFile" onchange="dataFileOnChange()">
+            <option value="">
+            <%
+            for (FileSetMember member : dataFiles)
+            {
+              File file = null;
+              DataFileType dft = null;
+              try
+              {
+                dft = member.getDataFileType();
+              }
+              catch (Throwable t)
+              {}
+              try
+              {
+                file = member.getFile();
+              }
+              catch (Throwable t)
+              {}
+              if (file != null)
+              {
+                String path = HTML.encodeTags(file.getPath().toString());
+                String type = dft != null ? "[" + HTML.encodeTags(dft.getName()) + "] " : "";
+                %>
+                <option value="<%=file.getId()%>"><%=type%><%=path%>
+                <%
+              }
+            }
+            %>
+            </select>
+          </td>
+        </tr>
+        <%
+      }
+      %>
       <%
       if (recentFiles.size() > 0)

trunk/www/common/plugin/configure.jsp

@@ -217 +217 @@
                 else if (value instanceof File && pType instanceof FileParameterType)
                 {
-                  value = ((File)value).getPath().toString();
+                  File file = File.getById(dc, ((File)value).getId());
+                  value = file.getPath().toString();
                 }
                 else if (value instanceof BasicItem)