Update of
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
In directory
james.mmbase.org:/tmp/cvs-serv13229/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
Modified Files:
OODocUploadAction.java AddSingleAction.java
OODocStoreAction.java
Log Message:
CMSC-472.
Add enter point in content.jsp.
implement Openoffice export function ,server side function.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
See also: http://www.mmbase.org/jira/browse/CMSC-472
Index: OODocUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms/OODocUploadAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- OODocUploadAction.java 21 Jan 2008 07:35:30 -0000 1.1
+++ OODocUploadAction.java 22 Jan 2008 10:26:12 -0000 1.2
@@ -10,6 +10,8 @@
import org.mmbase.bridge.Cloud;
import javax.servlet.http.HttpServletRequest;
+
+import java.io.File;
import java.util.List;
public class OODocUploadAction extends OpenOfficeIntegrationBaseAction {
@@ -23,7 +25,7 @@
String dir = servlet.getServletContext().getRealPath("/") +
OODocUploadUtil.TEMP_PATH;
OODocUploadUtil docUpload = OODocUploadUtil.getInstance();
- docUpload.upload(request, dir);
+ boolean isOdtDoc = docUpload.upload(request, dir);
/**channel number**/
String channel = docUpload.getChannel();
@@ -34,8 +36,9 @@
//save channel number at client
addToRequest(request, "parent", channel);
- List<OdtDocument> odts = docUpload.getOdtDocuments(dir);
+ List<OdtDocument> odts = docUpload.getOdtDocuments(dir+ File.separator
+ channel);
request.setAttribute("binaries", odts);
+ request.setAttribute("odtDoc", isOdtDoc);
String forwardPath =
mapping.findForward(SUCCESS).getPath()+"?parent"+channel;
return new ActionForward(forwardPath);
Index: AddSingleAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms/AddSingleAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AddSingleAction.java 21 Jan 2008 07:35:30 -0000 1.1
+++ AddSingleAction.java 22 Jan 2008 10:26:12 -0000 1.2
@@ -17,12 +17,6 @@
@Override
public ActionForward execute(ActionMapping mapping,
HttpServletRequest request, Cloud cloud) throws
Exception {
-
- String dir =
servlet.getServletContext().getRealPath("/")+OODocUploadUtil.TEMP_PATH;
-
- OODocUploadUtil docUpload = OODocUploadUtil.getInstance();
- docUpload.upload(request,dir);
-
return mapping.findForward(SUCCESS);
}
Index: OODocStoreAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms/OODocStoreAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- OODocStoreAction.java 21 Jan 2008 07:35:30 -0000 1.1
+++ OODocStoreAction.java 22 Jan 2008 10:26:12 -0000 1.2
@@ -3,6 +3,7 @@
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.openoffice.model.OdtDocument;
import com.finalist.cmsc.openoffice.service.OdtFileTranster;
+import com.finalist.cmsc.openoffice.service.OODocUploadUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -24,14 +25,26 @@
/*retrieve channel number*/
String channelId = getChannelId(request);
+
+ if(StringUtils.isEmpty(channelId) && request.getParameter("root") !=
null)
+ {
+ channelId = OODocUploadUtil.SINGLE_FILE_PATH;
+
+ }
+
String odtStoreLocation =
getOdtFileStoreLocation(getBaseStoreLocation(),channelId);
if (StringUtils.isEmpty(channelId)) {
channelId = RepositoryUtil.getRoot(cloud);
}
+ if(request.getParameter("root") != null)
+ {
+ channelId = request.getParameter("root");
- int nodenumber = store(cloud, odtStoreLocation, channelId);
+ }
+ int nodenumber = store(cloud, odtStoreLocation, channelId,"");
+ String target = mapping.findForward(SUCCESS).getPath() +
"?parentchannel=" + channelId + "&direction=down";
if (-1 != nodenumber) {
//there is only one document exist.
return new ActionForward(mapping.findForward("edit").getPath() +
"?objectnumber=" + nodenumber);
@@ -44,7 +57,7 @@
* storage the documents of odt
*/
@SuppressWarnings("unchecked")
- public int store(Cloud cloud, String odtStoreLocation, String channelId) {
+ public int store(Cloud cloud, String odtStoreLocation, String
channelId,String requestContext) {
OdtFileTranster.WORKINGFOLDER = getBaseStoreLocation()+ File.separator
+ "work";
@@ -56,7 +69,7 @@
File[] files = getAllOdtFiles(odtStoreLocation);
for (File file : files) {
- OdtDocument doc = OdtFileTranster.process(file);
+ OdtDocument doc = OdtFileTranster.process(file,requestContext);
Node node = manager.createNode();
node.setValue("title", doc.getTitle());
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
