Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv5054/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetUploadAction.java
Log Message:
CMSC-681 Asset Maintenance adding a limit when uploading asset elements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: AssetUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AssetUploadAction.java 11 Dec 2008 09:19:55 -0000 1.6
+++ AssetUploadAction.java 18 Dec 2008 09:00:26 -0000 1.7
@@ -24,6 +24,7 @@
import org.mmbase.util.transformers.ByteToCharTransformer;
import org.mmbase.util.transformers.ChecksumFactory;
+import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.services.versioning.Versioning;
import com.finalist.cmsc.services.workflow.Workflow;
import com.finalist.cmsc.struts.MMBaseAction;
@@ -39,8 +40,10 @@
String parentchannel = assetUploadForm.getParentchannel();
FormFile file = assetUploadForm.getFile();
+ int fileSize = file.getFileSize();
+ String exceed = "no";
- if (file.getFileSize() != 0 && file.getFileName() != null) {
+ if (fileSize != 0 && file.getFileName() != null) {
String assetType = "";
if (isImage(file.getFileName())) {
assetType = "images";
@@ -51,9 +54,11 @@
List<Integer> nodes = null;
NodeManager manager = cloud.getNodeManager(assetType);
+ long maxFileSize =
Integer.parseInt(PropertiesUtil.getProperty("uploaded.file.max.size"))*1024*1024;
+ if (fileSize < maxFileSize) {
ChecksumFactory checksumFactory = new ChecksumFactory();
- ByteToCharTransformer transformer = (ByteToCharTransformer)
checksumFactory.createTransformer(checksumFactory
- .createParameters());
+ ByteToCharTransformer transformer = (ByteToCharTransformer)
checksumFactory
+ .createTransformer(checksumFactory.createParameters());
String checkSum = transformer.transform(file.getFileData());
NodeQuery query = manager.createQuery();
SearchUtil.addEqualConstraint(query, manager.getField("checksum"),
checkSum);
@@ -66,9 +71,11 @@
request.setAttribute("uploadedAssets", nodes);
} else {
return new ActionForward(mapping.findForward(SUCCESS).getPath()
- + "?type=asset&direction=down&exist=1&parentchannel=" +
parentchannel, true);
+ + "?type=asset&direction=down&exist=1&exceed=" + exceed +
"&parentchannel=" + parentchannel, true);
+ }
+ } else {
+ exceed = "yes";
}
-
// to archive the upload asset
if (nodes != null && nodes.size() > 0) {
for (Integer node : nodes) {
@@ -83,7 +90,7 @@
}
}
return new ActionForward(mapping.findForward(SUCCESS).getPath()
- + "?type=asset&direction=down&exist=0&parentchannel=" +
parentchannel, true);
+ + "?type=asset&direction=down&exist=0&exceed=" + exceed +
"&parentchannel=" + parentchannel, true);
}
private static Set<String> supportedImages;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
