Author: tdraier
Date: Fri Sep 14 12:48:35 2007
New Revision: 18456
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18456&repname=
=3Djahia
Log:
detect more file inside bigtext for export, correctly decode filenames ( CA=
P-10 ) (port 18173)
Modified:
trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportExportB=
aseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportExportBaseService.java&rev=3D18456&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java (original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java Fri Sep 14 12:48:35 2007
@@ -101,6 +101,7 @@
import javax.xml.parsers.SAXParserFactory;
import java.io.*;
import java.net.URL;
+import java.net.URLDecoder;
import java.security.Principal;
import java.text.DateFormat;
import java.text.ParseException;
@@ -2470,7 +2471,7 @@
}
=
public String parseBigtextFiles(String rawValue, Set files, Processing=
Context jParams) throws JahiaException {
- String str =3D " src=3D\"###/webdav";
+ String str =3D "###/webdav";
if (rawValue =3D=3D null || rawValue.length() =3D=3D 0 ||
rawValue.toLowerCase().indexOf(str) < 0) {
return rawValue;
@@ -2496,7 +2497,7 @@
}
b.replace(from,to,fname);
try {
- DAVFileAccess f =3D new DAVFileAccess(jParams, site, jPara=
ms.getUser(), fname);
+ DAVFileAccess f =3D new DAVFileAccess(jParams, site, jPara=
ms.getUser(), URLDecoder.decode(fname));
if (f.isValid()) {
files.add(f);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
