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

ETHREEOH-2126 - WCM meta data extraction does not extract title when form is created

Browse Source 
- metadata extractor was not firing 
 - titled aspect was applied after extraction thereby overwriting extracted value.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-10-20 09:25:04 +00:00
parent 162ef0aaec
commit f3f3e40efa
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.model.WCMAppModel; import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.web.scripts.FileTypeImageUtils; import org.alfresco.repo.web.scripts.FileTypeImageUtils;
@@ -493,6 +494,10 @@ public class CreateWebContentWizard extends CreateContentWizard
final String cwd = AVMUtil.getCorrespondingPathInPreviewStore(this.avmBrowseBean.getCurrentPath()); final String cwd = AVMUtil.getCorrespondingPathInPreviewStore(this.avmBrowseBean.getCurrentPath());
final Form form = (MimetypeMap.MIMETYPE_XML.equals(this.mimeType) ? this.getForm() : null); final Form form = (MimetypeMap.MIMETYPE_XML.equals(this.mimeType) ? this.getForm() : null);
String path = cwd; String path = cwd;
final Map<QName, PropertyValue> props = new HashMap<QName, PropertyValue>(1, 1.0f);
final List<QName> aspects = new ArrayList<QName>(4);
if (form != null) if (form != null)
{ {
path = form.getOutputPathForFormInstanceData(this.getInstanceDataDocument(), fileName, cwd, this.avmBrowseBean.getWebapp()); path = form.getOutputPathForFormInstanceData(this.getInstanceDataDocument(), fileName, cwd, this.avmBrowseBean.getWebapp());
@@ -500,7 +505,12 @@ public class CreateWebContentWizard extends CreateContentWizard
final String[] sb = AVMNodeConverter.SplitBase(path); final String[] sb = AVMNodeConverter.SplitBase(path);
path = sb[0]; path = sb[0];
fileName = sb[1]; fileName = sb[1];
props.put(WCMAppModel.PROP_PARENT_FORM_NAME, new PropertyValue(null, form.getName()));
props.put(WCMAppModel.PROP_ORIGINAL_PARENT_PATH, new PropertyValue(null, cwd));
aspects.add(WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
} }
props.put(ContentModel.PROP_TITLE, new PropertyValue(null, fileName));
aspects.add(ContentModel.ASPECT_TITLED);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("creating all directories in path " + path); logger.debug("creating all directories in path " + path);
@@ -535,9 +545,13 @@ public class CreateWebContentWizard extends CreateContentWizard
} }
} }
// create the file /**
* create the new file
*/
getAvmService().createFile(path, fileName, getAvmService().createFile(path, fileName,
new ByteArrayInputStream((this.content == null ? "" : this.content).getBytes("UTF-8"))); new ByteArrayInputStream((this.content == null ? "" : this.content).getBytes("UTF-8")),
aspects,
props);
} }
catch (AVMExistsException avmee) catch (AVMExistsException avmee)
{ {
@@ -551,16 +565,12 @@ public class CreateWebContentWizard extends CreateContentWizard
// add titled aspect for the read/edit properties screens // add titled aspect for the read/edit properties screens
final NodeRef formInstanceDataNodeRef = AVMNodeConverter.ToNodeRef(-1, this.createdPath); final NodeRef formInstanceDataNodeRef = AVMNodeConverter.ToNodeRef(-1, this.createdPath);
final Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
props.put(ContentModel.PROP_TITLE, fileName);
this.getNodeService().addAspect(formInstanceDataNodeRef, ContentModel.ASPECT_TITLED, props);
/**
* Generate form renditions.
*/
if (form != null) if (form != null)
{ {
props.clear();
props.put(WCMAppModel.PROP_PARENT_FORM_NAME, form.getName());
props.put(WCMAppModel.PROP_ORIGINAL_PARENT_PATH, cwd);
this.getNodeService().addAspect(formInstanceDataNodeRef, WCMAppModel.ASPECT_FORM_INSTANCE_DATA, props);
this.formInstanceData = getFormsService().getFormInstanceData(formInstanceDataNodeRef); this.formInstanceData = getFormsService().getFormInstanceData(formInstanceDataNodeRef);
this.renditions = new LinkedList<Rendition>(); this.renditions = new LinkedList<Rendition>();