Changeset 4033

Timestamp:

Dec 4, 2007, 4:45:48 PM (15 years ago)

Author:

Martin Svensson

Message:

Fixes #859 Downloading file from web services fails if the filename in BASE starts with a number.
A test is set up with a cel file in TestWebservices?.

Location:

trunk/src

Files:

• test/TestFile.java (modified) (1 diff)
• test/TestWebservices.java (modified) (1 diff)
• webservices/server/net/sf/basedb/ws/server/ArrayDesignService.java (modified) (2 diffs)
• webservices/server/net/sf/basedb/ws/server/BioAssaySetService.java (modified) (1 diff)
• webservices/server/net/sf/basedb/ws/server/RawBioAssayService.java (modified) (3 diffs)
• webservices/server/net/sf/basedb/ws/server/ReporterService.java (modified) (2 diffs)

trunk/src/test/TestFile.java

@@ -228 +228 @@
   }
   
+  /**
+    @since 2.5
+   */
+  static void test_rename(int id, String newName)
+  {
+    if (id == 0) return;
+    DbControl dc = null;
+    File file = null;
+    String oldName = null;
+    try
+    {
+      dc = TestUtil.getDbControl();
+      file = File.getById(dc, id);
+      oldName = file.getName();
+      file.setName(newName);
+      dc.commit();
+      write("--Rename fileId: " + file.getId() + " from " + oldName + " to " + newName + " OK");
+    }
+    catch (Throwable ex)
+    {
+      write("--Rename file: " + file + " FAILED");
+      ex.printStackTrace();
+      ok = false;
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+  }
+  
   static void write_header()
   {

trunk/src/test/TestWebservices.java

@@ -141 +141 @@
     test_AnnotationTypes(client);
     test_getRawDataInExperiment(client, experimentId1, rawBioAssayId1);
-    test_getRawDataInExperiment(client, experimentId2, rawBioAssayId3);   
+    test_getRawDataInExperiment(client, experimentId2, rawBioAssayId3); 
+
+    //Test to download a file which name in BASE starts with a number.
+    TestFile.test_rename(celId, "2rawdataFile.txt");
+    test_getRawDataInExperiment(client, experimentId2, rawBioAssayId3);
+    
     test_getArrayDesign(client, rawBioAssayId1, arrayDesignId1);
     test_getArrayDesign(client, rawBioAssayId3, arrayDesignId2);    

trunk/src/webservices/server/net/sf/basedb/ws/server/ArrayDesignService.java

@@ -28 +28 @@
 import net.sf.basedb.core.DataFileType;
 import net.sf.basedb.core.DbControl;
-import net.sf.basedb.core.File;
 import net.sf.basedb.core.FileSet;
 import net.sf.basedb.core.FileSetMember;
@@ -126 +125 @@
         {
           FileSetMember member = fileSet.getMember(type);
-          File file = member.getFile();
           BaseFileDataSource source = new BaseFileDataSource(member.getFile());
-          toDownload = attachFile(source, file.getName());
+          toDownload = attachFile(source, "downloadFile");
         }
       }

trunk/src/webservices/server/net/sf/basedb/ws/server/BioAssaySetService.java

@@ -103 +103 @@
     if (format == null) return null;
     
-    String elementName = "exportFile";
+    String elementName = "downloadFile";
     OMElement elementWithAttachment = null;
     

trunk/src/webservices/server/net/sf/basedb/ws/server/RawBioAssayService.java

@@ -27 +27 @@
 import net.sf.basedb.core.DataFileType;
 import net.sf.basedb.core.DbControl;
-import net.sf.basedb.core.File;
 import net.sf.basedb.core.FileSet;
 import net.sf.basedb.core.FileSetMember;
@@ -39 +38 @@
 import net.sf.basedb.info.RawBioAssayInfo;
 
-
 import org.apache.axiom.om.OMElement;
 
@@ -150 +148 @@
         {
           FileSetMember member = fileSet.getMember(type);
-          File file = member.getFile();
           BaseFileDataSource source = new BaseFileDataSource(member.getFile());
-          toDownload = attachFile(source, file.getName());
+          toDownload = attachFile(source, "downloadFile");
         }
       }

trunk/src/webservices/server/net/sf/basedb/ws/server/ReporterService.java

@@ -105 +105 @@
     File exportFile = null;   
     OMElement elementWithAttachment = null;
-    String elementName = "exportFile";
+    String elementName = "downloadFile";
     String format = "text";
     Item itemType = Item.REPORTERSCORE;
@@ -170 +170 @@
     File exportFile = null;   
     OMElement elementWithAttachment = null;
-    String elementName = "exportFile";
+    String elementName = "downloadFile";
     String format = "text";
     Item itemType = Item.REPORTER;