Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java,v diff -u -r1.10 -r1.11 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java 3 Aug 2005 02:33:47 -0000 1.10 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java 4 Aug 2005 06:07:29 -0000 1.11 @@ -61,7 +61,7 @@ * * @struts:action path="/authoring" name="NbAuthoringForm" scope="session" * type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction" - * parameter="method" + * parameter="method" validate="false" * * @struts.action-exception key="error.exception.NbApplication" scope="request" * type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException" @@ -255,16 +255,16 @@ */ getToolContentHandler().deleteFile(file.getUuid()); - NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), + nbService.removeAttachment(file); + + /* NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), theFile.getContentType(), fileType); file.setUuid(node.getUuid()); //only need to update the uuid, the rest of the info is the same file.setVersionId(node.getVersion()); - nbService.saveAttachment(file); + nbService.saveAttachment(file); */ } - else - { /** * This is a new file and so is saved to the content repository. * @@ -279,8 +279,8 @@ file.setUuid(node.getUuid()); file.setVersionId(node.getVersion()); /** TODO: change versionId to version */ nbService.saveAttachment(file); - } + String keyName = file.returnKeyName(); //add the files to the map