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

Google Doc integration fixes:

Browse Source 
- Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code
  - Unit tests failures for excel sheets fixed
  - Able to now create and checkout docs, sheets and presentations successfullly
  - Docs, sheets and presentations downloadable and viewable
  - Fixed ALF-2700
  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2010-05-20 09:11:19 +00:00
parent f15c6b1379
commit d2a4743e80
4 changed files with 93 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/googledocs/GoogleDocsServiceImpl.java
View File

@@ -30,7 +30,6 @@ import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.TransactionListenerAdapter;
@@ -53,6 +52,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.google.gdata.client.GoogleService;
import com.google.gdata.client.GoogleAuthTokenFactory.UserToken;
import com.google.gdata.client.docs.DocsService;
import com.google.gdata.data.IEntry;
import com.google.gdata.data.MediaContent;
@@ -64,7 +64,9 @@ import com.google.gdata.data.acl.AclScope;
import com.google.gdata.data.docs.DocumentEntry;
import com.google.gdata.data.docs.DocumentListEntry;
import com.google.gdata.data.docs.FolderEntry;
import com.google.gdata.data.docs.PresentationEntry;
import com.google.gdata.data.docs.SpreadsheetEntry;
import com.google.gdata.data.docs.DocumentListEntry.MediaType;
import com.google.gdata.data.media.MediaSource;
import com.google.gdata.data.media.MediaStreamSource;
import com.google.gdata.util.AuthenticationException;
@@ -297,7 +299,10 @@ public class GoogleDocsServiceImpl extends TransactionListenerAdapter
{
// Get the mime type and input stream from the content reader
mimetype = contentReader.getMimetype();
is = contentReader.getContentInputStream();
if (contentReader.getSize() != 0)
{
is = contentReader.getContentInputStream();
}
}
// Get the parent folder id
@@ -493,6 +498,9 @@ public class GoogleDocsServiceImpl extends TransactionListenerAdapter
// Create the folder and set the meta data in Alfresco
folder = createGoogleFolder(name, parentFolder);
setResourceDetails(parentNodeRef, folder);
// Set the owner of the document
setGoogleResourcePermission(folder, AuthorityType.USER, username, "owner");
}
}
@@ -588,23 +596,23 @@ public class GoogleDocsServiceImpl extends TransactionListenerAdapter
// TODO need to verify that download of a spreadsheet works before we delete this historical code ...
// UserToken docsToken = null;
// if (isSpreadSheet)
// {
// docsToken = (UserToken) googleDocumentService.getAuthTokenFactory().getAuthToken();
// UserToken spreadsheetsToken = (UserToken) spreadsheetsService.getAuthTokenFactory().getAuthToken();
// googleDocumentService.setUserToken(spreadsheetsToken.getValue());
//
// }
UserToken docsToken = null;
if (docType.equals(TYPE_SPREADSHEET) == true)
{
docsToken = (UserToken) googleDocumentService.getAuthTokenFactory().getAuthToken();
UserToken spreadsheetsToken = (UserToken) spreadsheetsService.getAuthTokenFactory().getAuthToken();
googleDocumentService.setUserToken(spreadsheetsToken.getValue());
}
MediaContent mc = new MediaContent();
mc.setUri(downloadUrl);
MediaSource ms = googleDocumentService.getMedia(mc);
// if (isSpreadSheet)
// {
// googleDocumentService.setUserToken(docsToken.getValue());
// }
if (docType.equals(TYPE_SPREADSHEET) == true)
{
googleDocumentService.setUserToken(docsToken.getValue());
}
result = ms.getInputStream();
}
@@ -717,10 +725,17 @@ public class GoogleDocsServiceImpl extends TransactionListenerAdapter
// Create the document entry object
DocumentListEntry docEntry = null;
if (MimetypeMap.MIMETYPE_EXCEL.equals(mimetype) == true)
if (MediaType.XLS.getMimeType().equals(mimetype) == true ||
MediaType.XLSX.getMimeType().equals(mimetype) == true ||
MediaType.ODS.getMimeType().equals(mimetype) == true)
{
docEntry = new SpreadsheetEntry();
}
else if (MediaType.PPS.getMimeType().equals(mimetype) == true ||
MediaType.PPT.getMimeType().equals(mimetype) == true)
{
docEntry = new PresentationEntry();
}
else
{
docEntry = new DocumentEntry();
@@ -771,6 +786,7 @@ public class GoogleDocsServiceImpl extends TransactionListenerAdapter
* @param mimeType mimetype
* @param is input stream
*/
@SuppressWarnings("unused")
private void updateGoogleDocContent(DocumentListEntry document, String mimeType, InputStream is)
{
// Log details