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

Fix for ALF-7654 - Share content upload performs several updates to cm:content property

Browse Source 
- added specialised write(content) method to ScriptNode to allow the mimetype, encoding etc. to all be calculated and applied in a single call.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-10-10 14:34:21 +00:00
parent 6d41e3f0bd
commit 8d2f8a159d
1 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -3454,7 +3454,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
} }
/** /**
* Set the content stream from another content object * Set the content stream from another content object.
* *
* @param content ScriptContent to set * @param content ScriptContent to set
*/ */
@@ -3469,9 +3469,39 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
// update cached variables after putContent() // update cached variables after putContent()
this.contentData = (ContentData) services.getNodeService().getProperty(nodeRef, this.property); this.contentData = (ContentData) services.getNodeService().getProperty(nodeRef, this.property);
} }
/**
* Set the content stream from another content object.
*
* @param content ScriptContent to set
* @param applyMimetype If true, apply the mimetype from the Content object, else leave the original mimetype
* @param guessEncoding If true, guess the encoding from the underlying input stream, else use encoding set in
* the Content object as supplied.
*/
public void write(Content content, boolean applyMimetype, boolean guessEncoding)
{
ContentService contentService = services.getContentService();
ContentWriter writer = contentService.getWriter(nodeRef, this.property, true);
if (applyMimetype)
{
writer.setMimetype(content.getMimetype());
}
if (guessEncoding)
{
writer.setEncoding(guessEncoding(content.getInputStream()));
}
else
{
writer.setEncoding(content.getEncoding());
}
writer.putContent(content.getInputStream());
// update cached variables after putContent()
this.contentData = (ContentData) services.getNodeService().getProperty(nodeRef, this.property);
}
/** /**
* Set the content stream from another input stream * Set the content stream from another input stream.
* *
* @param inputStream * @param inputStream
*/ */
@@ -3587,12 +3617,15 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
* the appropriate encoding (such as UTF-16 or similar) will be appiled if detected. * the appropriate encoding (such as UTF-16 or similar) will be appiled if detected.
*/ */
public void guessEncoding() public void guessEncoding()
{
setEncoding(guessEncoding(getInputStream()));
}
private String guessEncoding(InputStream in)
{ {
String encoding = "UTF-8"; String encoding = "UTF-8";
InputStream in = null;
try try
{ {
in = getInputStream();
if (in != null) if (in != null)
{ {
Charset charset = services.getMimetypeService().getContentCharsetFinder().getCharset(in, getMimetype()); Charset charset = services.getMimetypeService().getContentCharsetFinder().getCharset(in, getMimetype());
@@ -3612,7 +3645,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
{ {
} }
} }
setEncoding(encoding); return encoding;
} }
private ContentData contentData; private ContentData contentData;