Update of
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/upload/service
In directory
james.mmbase.org:/tmp/cvs-serv14248/openofficeintegration/src/java/com/finalist/cmsc/upload/service
Modified Files:
ChangeHtml.java OdtFileTranster.java
Log Message:
CMSC-471
Add image auto upload and save.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/upload/service
See also: http://www.mmbase.org/jira/browse/CMSC-471
Index: ChangeHtml.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/upload/service/ChangeHtml.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ChangeHtml.java 21 Jan 2008 06:00:47 -0000 1.1
+++ ChangeHtml.java 21 Jan 2008 06:41:05 -0000 1.2
@@ -9,6 +9,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
+import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -34,7 +35,7 @@
public class ChangeHtml {
Parserfactory pf = new Parserfactory();
- public void change(String xmlUrl,HashMap hs) throws IOException,
TransformerFactoryConfigurationError, TransformerException
+ public void change(String xmlUrl,HashMap hs, Map mapping) throws
IOException, TransformerFactoryConfigurationError, TransformerException
{
FileReader fr = new FileReader(xmlUrl);
InputSource source = new InputSource(fr);
Index: OdtFileTranster.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/upload/service/OdtFileTranster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- OdtFileTranster.java 21 Jan 2008 06:00:47 -0000 1.1
+++ OdtFileTranster.java 21 Jan 2008 06:41:05 -0000 1.2
@@ -24,18 +24,21 @@
public static OdtDocument process(File file) {
-
String middelFileLocation = WORKINGFOLDER + File.separator +
file.getName() + ".xml";
ChangeContentXml ccx = new ChangeContentXml();
ChangeHtml ch = new ChangeHtml();
OutFinishHtml ofh = new OutFinishHtml(file.getPath(),
middelFileLocation);
+
HashMap styleMap =
ccx.getStyleMap(ccx.getContentStyle(file.getPath()));
StringBuffer buffer = new StringBuffer();
+
+
try {
ofh.getFirstHtml();
- ch.change(middelFileLocation, styleMap);
+ Map rowAndSavedImageMap = saveAllImageToCMSC(new
FileInputStream(file));
+ ch.change(middelFileLocation, styleMap,rowAndSavedImageMap);
BufferedReader in = new BufferedReader(new
FileReader(middelFileLocation + ".html"));
String str;
@@ -54,6 +57,7 @@
log.error(e);
}
+
OdtDocument doc = new OdtDocument();
doc.setTitle(file.getName());
doc.setBody(buffer.toString());
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
