Changeset 1225

Timestamp:

May 5, 2010, 1:25:24 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #264: Investigate and fix issues with external files introduced in BASE 2.16

External files will show up as read-only for the FTP program. Files with an unknown size are reported to have size=0. This is not allowed in all cases by the FTP protocol. It is most likely only an issue when appending to a partly uploaded file and since we don't allow uploading there shouldn't be any problem.

Location:

extensions/net.sf.basedb.ftp/trunk

Files:

• README (modified) (2 diffs)
• build.xml (modified) (1 diff)
• src/net/sf/basedb/clients/ftp/BaseFtpFile.java (modified) (4 diffs)

extensions/net.sf.basedb.ftp/trunk/README

@@ -1 +1 @@
 == Requirements ==
 
- 1. BASE 2.10.0 or later.
+ 1. BASE 2.16.0 or later.
  
 == Introduction ==
@@ -41 +41 @@
    FTP clients since that is normally not allowed. The result for certain 
    operations is undefined for files and directories that has the same name.
-
+ * BASE 2.16 introduced an option to register files as a link to an external URL.
+   Such files-will show up as read-only in the FTP server. If the file size of an
+   external file is not known it is shown as 0 in the FTP server.
+ 
 == Tips and tricks ==
 

extensions/net.sf.basedb.ftp/trunk/build.xml

@@ -46 +46 @@
   <property name="javac.target" value="1.5" />
   <property name="javac.encoding" value="UTF-8" />
-  <property name="depend.jars" value="http://base2.thep.lu.se/base/jars/2.10.0" />
+  <property name="depend.jars" value="http://base2.thep.lu.se/base/jars/2.16.0" />
 
   <!-- set up classpath for compiling -->

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/BaseFtpFile.java

@@ -37 +37 @@
 import net.sf.basedb.core.Item;
 import net.sf.basedb.core.ItemQuery;
+import net.sf.basedb.core.Location;
 import net.sf.basedb.core.OwnedItem;
 import net.sf.basedb.core.Path;
@@ -171 +172 @@
   public long getSize() 
   {
-    return file == null ? 0 : file.getSize();
+    return file == null || file.getSize() < 0 ? 0 : file.getSize();
   }
 
@@ -260 +261 @@
     if (file != null)
     {
-      permission = file.hasPermission(Permission.WRITE);
+      permission = file.hasPermission(Permission.WRITE) && 
+        file.getLocation() != Location.EXTERNAL;
     }
     else if (directory != null)
@@ -503 +505 @@
       {
         // Upload to an existing file
-        dc.reattachItem(file);
+        dc.reattachItem(file, false);
       }
       else