diff --git a/src/zall/UploadServlet.java b/src/zall/UploadServlet.java index e814c4c..e3e1731 100644 --- a/src/zall/UploadServlet.java +++ b/src/zall/UploadServlet.java @@ -30,9 +30,8 @@ public class UploadServlet extends AjaxFileUpload{ private static final Logger logger = LogUtil.getLogger(); private static final long serialVersionUID = 1L; - public static final Set VIDEO_EXT = Collections.unmodifiableSet(new HashSet(Arrays.asList(new String[]{ - "avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v" - }))); + private static final Set VIDEO_EXT = Collections.unmodifiableSet(new HashSet(Arrays.asList( + "avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v"))); @Override public String getProgressHTML() { @@ -76,6 +75,7 @@ public class UploadServlet extends AjaxFileUpload{ vid.setUser( user ); vid.setFile( item ); vid.save(db); + logger.info("Video upload successful: "+vid.getFolder().getPath()); } else{ Image img = new Image(); @@ -83,7 +83,8 @@ public class UploadServlet extends AjaxFileUpload{ img.setFolder( folder ); img.setUser( user ); img.setFile( item ); - img.save(db); + img.save(db); + logger.info("Image upload successful: "+img.getFolder().getPath()); } } catch (Exception e) { logger.log(Level.WARNING, "Error: Creating new Media(\""+item.getName()+"\")", e); diff --git a/src/zall/bean/Folder.java b/src/zall/bean/Folder.java index 6ee98ac..6f4cc36 100755 --- a/src/zall/bean/Folder.java +++ b/src/zall/bean/Folder.java @@ -24,10 +24,11 @@ public class Folder extends DBBean{ private static final Logger logger = LogUtil.getLogger(); private transient String name; - protected Long user; + protected long user = -1; protected transient User userInstance; private String path; protected Folder parent; + protected Timestamp date; private boolean isPrivate; @@ -67,6 +68,7 @@ public class Folder extends DBBean{ } public Folder(){ + date = new Timestamp( System.currentTimeMillis() ); } public String getName(){ @@ -125,6 +127,10 @@ public class Folder extends DBBean{ return parent; } + public Timestamp getDate(){ + return date; + } + /** * @param filename is the name of the file @@ -139,7 +145,7 @@ public class Folder extends DBBean{ return null; } - if( user == null || filename == null ) + if( user < 0 || filename == null ) return null; StringBuilder tmp = new StringBuilder();