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

Merged V2.1 to HEAD

Browse Source 
6293: WCM fixes by Ariel (no details)
   6294: Fogotten file for above


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 12:26:25 +00:00
parent 03afc572b3
commit 10236f165a
47 changed files with 1596 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
View File

@@ -67,9 +67,9 @@ import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.UIListItem;
import org.alfresco.web.ui.wcm.WebResources;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.StringUtils;
import org.w3c.dom.Document;
/**
@@ -119,12 +119,12 @@ public class RegenerateRenditionsWizard
if (this.regenerateScope.equals(REGENERATE_SCOPE_FORM))
{
description = MessageFormat.format("regenerate_renditions_snapshot_description_scope_form",
StringUtils.arrayToDelimitedString(this.selectedForms, ", "));
StringUtils.join(this.selectedForms, ", "));
}
else if (this.regenerateScope.equals(REGENERATE_SCOPE_RENDERING_ENGINE_TEMPLATE))
{
description = MessageFormat.format("regenerate_renditions_snapshot_description_scope_rendering_engine_template",
StringUtils.arrayToDelimitedString(this.selectedRenderingEngineTemplates, ", "));
StringUtils.join(this.selectedRenderingEngineTemplates, ", "));
}
else
{
@@ -422,8 +422,17 @@ public class RegenerateRenditionsWizard
{
@Override
public Form getForm()
throws FormNotFoundException
{
return RegenerateRenditionsWizard.this.selectedWebProject.getForm(super.getForm().getName());
final Form f = super.getForm();
try
{
return RegenerateRenditionsWizard.this.selectedWebProject.getForm(f.getName());
}
catch (FormNotFoundException fnfe)
{
throw new FormNotFoundException(f, RegenerateRenditionsWizard.this.selectedWebProject, this);
}
}
};
result.add(fid);
@@ -497,14 +506,21 @@ public class RegenerateRenditionsWizard
query.append(" +(");
for (int i = 0; i < this.selectedRenderingEngineTemplates.length; i++)
{
final Form f = this.selectedWebProject.getForm(this.selectedRenderingEngineTemplates[i].split(":")[0]);
final RenderingEngineTemplate ret = f.getRenderingEngineTemplate((String)this.selectedRenderingEngineTemplates[i].split(":")[1]);
query.append("@" + Repository.escapeQName(WCMAppModel.PROP_PARENT_RENDERING_ENGINE_TEMPLATE) +
":\"" + ((RenderingEngineTemplateImpl)ret).getNodeRef() + "\"");
if (i != this.selectedRenderingEngineTemplates.length - 1)
try
{
query.append(" OR ");
final String formName = this.selectedRenderingEngineTemplates[i].split(":")[0];
final Form f = this.selectedWebProject.getForm(formName);
final RenderingEngineTemplate ret = f.getRenderingEngineTemplate((String)this.selectedRenderingEngineTemplates[i].split(":")[1]);
query.append("@" + Repository.escapeQName(WCMAppModel.PROP_PARENT_RENDERING_ENGINE_TEMPLATE) +
":\"" + ((RenderingEngineTemplateImpl)ret).getNodeRef() + "\"");
if (i != this.selectedRenderingEngineTemplates.length - 1)
{
query.append(" OR ");
}
}
catch (FormNotFoundException fnfe)
{
LOGGER.debug(fnfe);
}
}
query.append(") ");
@@ -528,25 +544,41 @@ public class RegenerateRenditionsWizard
{
@Override
public Form getForm()
throws FormNotFoundException
{
return RegenerateRenditionsWizard.this.selectedWebProject.getForm(super.getForm().getName());
final Form f = super.getForm();
try
{
return RegenerateRenditionsWizard.this.selectedWebProject.getForm(f.getName());
}
catch (FormNotFoundException fnfe)
{
throw new FormNotFoundException(f, RegenerateRenditionsWizard.this.selectedWebProject, this);
}
}
};
final List<FormInstanceData.RegenerateResult> regenResults = fid.regenerateRenditions();
for (final FormInstanceData.RegenerateResult rr : regenResults)
try
{
if (rr.getException() != null)
final List<FormInstanceData.RegenerateResult> regenResults = fid.regenerateRenditions();
for (final FormInstanceData.RegenerateResult rr : regenResults)
{
Utils.addErrorMessage("error regenerating rendition using " + rr.getRenderingEngineTemplate().getName() +
": " + rr.getException().getMessage(),
rr.getException());
}
else
{
result.add(rr.getRendition());
if (rr.getException() != null)
{
Utils.addErrorMessage("error regenerating rendition using " + rr.getRenderingEngineTemplate().getName() +
": " + rr.getException().getMessage(),
rr.getException());
}
else
{
result.add(rr.getRendition());
}
}
}
catch (FormNotFoundException fnfe)
{
Utils.addErrorMessage("error regenerating renditions of " + fid.getPath() + ": " + fnfe.getMessage(), fnfe);
}
}
else
{