Author: mfortun Date: 2011-05-26 18:17:49 +0200 (Thu, 26 May 2011) New Revision: 923 Url: http://nuiton.org/repositories/revision/wikitty/923 Log: * add support for default pubdatavalue from the uploaded file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-25 15:31:21 UTC (rev 922) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-26 16:17:49 UTC (rev 923) @@ -45,6 +45,10 @@ protected File uploadedFile; + private String uploadFileName; + + private String uploadContentType; + static public PublicationActionEdit getAction() { return (PublicationActionEdit) ActionContext.getContext().get( CONTEXT_ACTION_KEY); @@ -63,10 +67,8 @@ wikittyId = getArgument("id", ""); version = getArgument("version", ""); - + doAction(); - doAction(); - putIdArgs(wikitty.getId()); return SUCCESS; @@ -160,6 +162,7 @@ if (!"true".equals(getArgument("isNull-" + key, "false"))) { + System.out.println("not null + " + key); value = field.getValue(); } @@ -187,6 +190,9 @@ wikitty.setField(ext, fieldName, list); } else { + + // TODO mfortun-2011-05-26 need to handle if + // value == null and filename == null wikitty.setField(ext, fieldName, value); } @@ -197,18 +203,30 @@ .equals(WikittyPubData.FIELD_WIKITTYPUBDATA_CONTENT)) { if (null == WikittyPubDataHelper .getName(wikitty)) { + + String extension = "." + + FileUtil + .extension(uploadFileName); + String fileName = FileUtil.basename( + uploadFileName, extension); + WikittyPubDataHelper.setName(wikitty, - String.valueOf(wikittyFieldMap - .get(key + "-filename"))); + fileName); + } + if (null == WikittyPubDataHelper + .getFileExtension(wikitty)) { + WikittyPubDataHelper.setFileExtension( + wikitty, + FileUtil.extension(uploadFileName)); + + } + + if (null == WikittyPubDataHelper .getMimeType(wikitty)) { - WikittyPubDataHelper - .setMimeType( - wikitty, - String.valueOf(wikittyFieldMap - .get(key - + "-contentType"))); + WikittyPubDataHelper.setMimeType(wikitty, + uploadContentType); } } } @@ -224,11 +242,26 @@ } - public void setFile(File upload) { this.uploadedFile = upload; } + public String getFileContentType() { + return uploadContentType; + } + + public void setFileContentType(String uploadContentType) { + this.uploadContentType = uploadContentType; + } + + public String getFileFileName() { + return uploadFileName; + } + + public void setFileFileName(String uploadFileName) { + this.uploadFileName = uploadFileName; + } + public Wikitty getWikitty() { return wikitty; }