Update of
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
In directory
james.mmbase.org:/tmp/cvs-serv9896/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms
Modified Files:
OODocUploadAction.java OODocStoreAction.java
Log Message:
CMSC-471 modify build script.function finised.
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-471
Index: OODocUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms/OODocUploadAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- OODocUploadAction.java 22 Jan 2008 10:26:12 -0000 1.2
+++ OODocUploadAction.java 28 Jan 2008 09:11:26 -0000 1.3
@@ -1,45 +1,43 @@
package com.finalist.cmsc.openoffice.forms;
-import com.finalist.cmsc.openoffice.model.OdtDocument;
-import com.finalist.cmsc.openoffice.service.OODocUploadUtil;
-import org.apache.commons.lang.StringUtils;
+import java.io.File;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.File;
-import java.util.List;
+import com.finalist.cmsc.openoffice.model.OdtDocument;
+import com.finalist.cmsc.openoffice.service.OODocUploadUtil;
public class OODocUploadAction extends OpenOfficeIntegrationBaseAction {
private static Log log = LogFactory.getLog(OODocUploadAction.class);
@Override
- public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ public ActionForward execute(ActionMapping mapping,
+ HttpServletRequest request, Cloud cloud) throws
Exception {
// TODO Auto-generated method stub
- String dir = servlet.getServletContext().getRealPath("/") +
OODocUploadUtil.TEMP_PATH;
OODocUploadUtil docUpload = OODocUploadUtil.getInstance();
- boolean isOdtDoc = docUpload.upload(request, dir);
+ boolean isOdtDoc = docUpload.upload(request,
getBaseStoreLocation());
- /**channel number**/
+ /** channel number* */
String channel = docUpload.getChannel();
- if (StringUtils.isBlank(channel) || channel.equals("null"))
- channel = docUpload.getChannelbak();
- request.setAttribute("dir", dir);
-
- //save channel number at client
+ addToRequest(request, "dir", getBaseStoreLocation());
+ // save channel number at client
addToRequest(request, "parent", channel);
- List<OdtDocument> odts = docUpload.getOdtDocuments(dir+ File.separator
+ channel);
+ List<OdtDocument> odts =
docUpload.getOdtDocuments(getOdtFileStoreLocation(getBaseStoreLocation(),channel));
request.setAttribute("binaries", odts);
request.setAttribute("odtDoc", isOdtDoc);
- String forwardPath =
mapping.findForward(SUCCESS).getPath()+"?parent"+channel;
+ String forwardPath = mapping.findForward(SUCCESS).getPath() +
"?parent"
+ + channel;
return new ActionForward(forwardPath);
}
Index: OODocStoreAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/forms/OODocStoreAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- OODocStoreAction.java 22 Jan 2008 10:26:12 -0000 1.2
+++ OODocStoreAction.java 28 Jan 2008 09:11:26 -0000 1.3
@@ -26,8 +26,7 @@
/*retrieve channel number*/
String channelId = getChannelId(request);
- if(StringUtils.isEmpty(channelId) && request.getParameter("root") !=
null)
- {
+ if(StringUtils.isEmpty(channelId) && request.getParameter("root") !=
null) {
channelId = OODocUploadUtil.SINGLE_FILE_PATH;
}
@@ -37,12 +36,13 @@
if (StringUtils.isEmpty(channelId)) {
channelId = RepositoryUtil.getRoot(cloud);
}
- if(request.getParameter("root") != null)
- {
- channelId = request.getParameter("root");
+ if(request.getParameter("root") != null) {
+ channelId = request.getParameter("root");
}
- int nodenumber = store(cloud, odtStoreLocation, channelId,"");
+ String requestContext =
request.getScheme()+"://"+request.getServerName()+":"
+ +request.getServerPort()+request.getContextPath()+"/mmbase/images/";
+ int nodenumber = store(cloud, odtStoreLocation,
channelId,requestContext);
String target = mapping.findForward(SUCCESS).getPath() +
"?parentchannel=" + channelId + "&direction=down";
if (-1 != nodenumber) {
@@ -69,17 +69,17 @@
File[] files = getAllOdtFiles(odtStoreLocation);
for (File file : files) {
+
OdtDocument doc = OdtFileTranster.process(file,requestContext);
Node node = manager.createNode();
node.setValue("title", doc.getTitle());
node.setValue("body", doc.getBody());
-
node.commit();
RepositoryUtil.addContentToChannel(node, channelId);
// RepositoryUtil.addCreationChannel(node, channel);
// RepositoryUtil.addDeletionRelation(node, channel);
-// addRelToWorkFlow(service, node);
+ // addRelToWorkFlow(service, node);
firstNodeId = node.getNumber();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
