inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- not preventing save when generating a rendition fails.

Browse Source 
- only adding a rendition to the forminstancedata's rendition if rendering succeeds.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2007-01-22 22:50:53 +00:00
parent 53bddde72f
commit 2d184a6b13
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/web/bean/wcm/AVMEditBean.java
View File

@@ -453,12 +453,12 @@ public class AVMEditBean
{ {
rendition.regenerate(fid); rendition.regenerate(fid);
} }
catch (Throwable t) catch (Exception e)
{ {
LOGGER.error("error regenerating " + rendition.getName() +
": " + t.getMessage(), t);
Utils.addErrorMessage("error regenerating " + rendition.getName() + Utils.addErrorMessage("error regenerating " + rendition.getName() +
": " + t.getMessage(), t); " using " + rendition.getRenderingEngineTemplate().getName() +
": " + e.getMessage(),
e);
} }
} }
final NodeRef[] uploadedFiles = this.formProcessorSession.getUploadedFiles(); final NodeRef[] uploadedFiles = this.formProcessorSession.getUploadedFiles();

9
source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
View File

@@ -479,9 +479,18 @@ public class CreateWebContentWizard extends BaseContentWizard
this.renditions = new LinkedList<Rendition>(); this.renditions = new LinkedList<Rendition>();
for (RenderingEngineTemplate ret : form.getRenderingEngineTemplates()) for (RenderingEngineTemplate ret : form.getRenderingEngineTemplates())
{
try
{ {
this.renditions.add(ret.render(this.formInstanceData)); this.renditions.add(ret.render(this.formInstanceData));
} }
catch (Exception e)
{
Utils.addErrorMessage("Error generating rendition using " + ret.getName() +
": " + e.getMessage(),
e);
}
}
} }
else else
{ {

13
source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
View File

@@ -197,7 +197,8 @@ public class RenderingEngineTemplateImpl
{ {
final AVMService avmService = this.getServiceRegistry().getAVMService(); final AVMService avmService = this.getServiceRegistry().getAVMService();
final String renditionAvmPath = this.getOutputPathForRendition(formInstanceData); final String renditionAvmPath = this.getOutputPathForRendition(formInstanceData);
if (avmService.lookup(-1, renditionAvmPath) == null) final boolean isRegenerate = avmService.lookup(-1, renditionAvmPath) != null;
if (!isRegenerate)
{ {
final String parentAVMPath = AVMNodeConverter.SplitBase(renditionAvmPath)[0]; final String parentAVMPath = AVMNodeConverter.SplitBase(renditionAvmPath)[0];
AVMConstants.makeAllDirectories(parentAVMPath); AVMConstants.makeAllDirectories(parentAVMPath);
@@ -205,6 +206,13 @@ public class RenderingEngineTemplateImpl
AVMNodeConverter.SplitBase(renditionAvmPath)[1]); AVMNodeConverter.SplitBase(renditionAvmPath)[1]);
if (LOGGER.isDebugEnabled()) if (LOGGER.isDebugEnabled())
LOGGER.debug("Created file node for file: " + renditionAvmPath); LOGGER.debug("Created file node for file: " + renditionAvmPath);
}
final Rendition result = new RenditionImpl(AVMNodeConverter.ToNodeRef(-1, renditionAvmPath));
this.render(formInstanceData, result);
if (!isRegenerate)
{
avmService.addAspect(renditionAvmPath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA); avmService.addAspect(renditionAvmPath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
avmService.addAspect(renditionAvmPath, ContentModel.ASPECT_TITLED); avmService.addAspect(renditionAvmPath, ContentModel.ASPECT_TITLED);
avmService.addAspect(renditionAvmPath, WCMAppModel.ASPECT_RENDITION); avmService.addAspect(renditionAvmPath, WCMAppModel.ASPECT_RENDITION);
@@ -220,9 +228,6 @@ public class RenderingEngineTemplateImpl
new PropertyValue(DataTypeDefinition.TEXT, new PropertyValue(DataTypeDefinition.TEXT,
(Serializable)renditions)); (Serializable)renditions));
} }
final Rendition result = new RenditionImpl(AVMNodeConverter.ToNodeRef(-1, renditionAvmPath));
this.render(formInstanceData, result);
return result; return result;
} }

3
source/java/org/alfresco/web/forms/XSLFORenderingEngine.java
View File

@@ -66,7 +66,8 @@ public class XSLFORenderingEngine
MIME_TYPES.put(MimeConstants.MIME_SVG, MimeConstants.MIME_SVG); MIME_TYPES.put(MimeConstants.MIME_SVG, MimeConstants.MIME_SVG);
MIME_TYPES.put("image/svg", MimeConstants.MIME_SVG); MIME_TYPES.put("image/svg", MimeConstants.MIME_SVG);
MIME_TYPES.put(MimeConstants.MIME_GIF, MimeConstants.MIME_GIF); //looks like a dependency is missing - removing for now
//MIME_TYPES.put(MimeConstants.MIME_GIF, MimeConstants.MIME_GIF);
MIME_TYPES.put(MimeConstants.MIME_PNG, MimeConstants.MIME_PNG); MIME_TYPES.put(MimeConstants.MIME_PNG, MimeConstants.MIME_PNG);
MIME_TYPES.put(MimeConstants.MIME_JPEG, MimeConstants.MIME_JPEG); MIME_TYPES.put(MimeConstants.MIME_JPEG, MimeConstants.MIME_JPEG);
MIME_TYPES.put(MimeConstants.MIME_TIFF, MimeConstants.MIME_TIFF); MIME_TYPES.put(MimeConstants.MIME_TIFF, MimeConstants.MIME_TIFF);