Author: tdraier
Date: Fri Sep 21 10:33:59 2007
New Revision: 18588
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18588&repname=
=3Djahia
Log:
use original import file names in process display ( port 18404 )
Modified:
trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
trunk/core/src/java/org/jahia/engines/importexport/ManageImportExport.j=
ava
Modified: trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/sites/ManageSites.java&rev=3D18588&repname=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/admin/sites/ManageSites.java (original)
+++ trunk/core/src/java/org/jahia/admin/sites/ManageSites.java Fri Sep 21 1=
0:33:59 2007
@@ -993,6 +993,7 @@
=
logger.debug("createTemplateDir now");
File initialZip =3D null;
+ String initialZipName =3D null;
if (JahiaSiteTools.createTemplateDir(site)) {
String selectTmplSet =3D (String) request.getAttribute=
("selectedTmplSet");
JahiaTemplatesPackage tmplPack =3D null;
@@ -1051,6 +1052,7 @@
}
if ("fileImport".equals(firstImport)) {
initialZip =3D (File) request.getAttribute("fileImport=
");
+ initialZipName =3D (String) request.getAttribute("file=
ImportName");
}
if (initialZip =3D=3D null || !initialZip.exists() || "noI=
mport".equals(firstImport)) {
// create site language
@@ -1120,7 +1122,10 @@
}
}
jobDataMap.put(ImportJob.URI, path+"/"+uploadname);
- jobDataMap.put(ImportJob.FILENAME, initialZip.getN=
ame());
+ if (initialZipName =3D=3D null) {
+ initialZipName =3D initialZip.getName();
+ }
+ jobDataMap.put(ImportJob.FILENAME, initialZipName);
jobDataMap.put(ImportJob.CONTENT_TYPE, "applicatio=
n/zip");
Set locks =3D new HashSet();
LockKey lock =3D LockKey.composeLockKey(LockKey.IM=
PORT_ACTION + "_SITE", site.getID(), site.getID());
@@ -2042,8 +2047,9 @@
Set filesName =3D fileUpload.getFileNames();
Iterator iterator =3D filesName.iterator();
if (iterator.hasNext()) {
- File f =3D fileUpload.getFile((String) iterator.next());
- prepareFileImports(f, request);
+ String n =3D (String) iterator.next();
+ File f =3D fileUpload.getFile(n);
+ prepareFileImports(f, fileUpload.getFileSystemName(n),requ=
est);
}
=
}
@@ -2051,7 +2057,7 @@
File f=3D new File(jParams.getParameter("importpath"));
=
if (f.exists()) {
- prepareFileImports(f, request);
+ prepareFileImports(f, f.getName(), request);
}
}
if (jParams.getSessionState().getAttribute("importsInfos") !=3D nu=
ll) {
@@ -2065,13 +2071,13 @@
}
}
=
- private void prepareFileImports(File f, HttpServletRequest request) {
+ private void prepareFileImports(File f, String name, HttpServletReques=
t request) {
if (f !=3D null && f.exists()) {
try {
Properties exportProps =3D new Properties();
ZipInputStream zis =3D new ZipInputStream(new FileInputStr=
eam(f));
ZipEntry z;
- List imports =3D new ArrayList();
+ Map imports =3D new HashMap();
while ( (z =3D zis.getNextEntry()) !=3D null ) {
File i =3D File.createTempFile("import",".zip");
OutputStream os =3D new FileOutputStream(i);
@@ -2099,23 +2105,23 @@
} else if (n.equals("site.properties") || ((n.startsWi=
th("export_") && n.endsWith(".xml")))) {
// this is a single site import, stop everything a=
nd import
i.delete();
- for (Iterator iterator =3D imports.iterator(); ite=
rator.hasNext();) {
+ for (Iterator iterator =3D imports.keySet().iterat=
or(); iterator.hasNext();) {
File file =3D (File) iterator.next();
file.delete();
}
imports.clear();
File tempFile =3D File.createTempFile("import", ".=
zip");
FileUtils.copyFile(f, tempFile);
- imports.add(tempFile);
+ imports.put(tempFile,name);
break;
} else {
- imports.add(i);
+ imports.put(i,n);
}
}
Map importsInfos =3D new HashMap();
- for (Iterator iterator =3D imports.iterator(); iterator.ha=
sNext();) {
+ for (Iterator iterator =3D imports.keySet().iterator(); it=
erator.hasNext();) {
File i =3D (File) iterator.next();
- Map value =3D prepareSiteImport(i);
+ Map value =3D prepareSiteImport(i, (String) imports.ge=
t(i));
if (value !=3D null) {
importsInfos.put(i, value);
}
@@ -2134,9 +2140,10 @@
request.setAttribute("tmplSets", list);
}
=
- private Map prepareSiteImport(File i) throws IOException {
+ private Map prepareSiteImport(File i, String filename) throws IOExcept=
ion {
Map importInfos =3D new HashMap();
importInfos.put("importFile", i);
+ importInfos.put("importFileName", filename);
ZipEntry z;
ZipInputStream zis2 =3D new ZipInputStream(new FileInputStream(i));
while ( (z =3D zis2.getNextEntry())!=3Dnull) {
@@ -2228,7 +2235,7 @@
if ("".equals(tpl)) tpl =3D null;
try {
createSite(request, jParams.getUser().getUsername(=
), (String) infos.get("sitetitle"),
- (String) infos.get("siteservername"), (Str=
ing) infos.get("sitekey"), "", jParams.getLocale(), null, null, null, tpl, =
file, true);
+ (String) infos.get("siteservername"), (Str=
ing) infos.get("sitekey"), "", jParams.getLocale(), null, null, null, tpl, =
file, (String) infos.get("importFileName"),true);
} catch (Throwable e) {
logger.error("Cannot create site " + infos.get("si=
tetitle"), e);
}
@@ -2258,7 +2265,7 @@
// -------------------------- OTHER METHODS --------------------------
=
public void createSite(HttpServletRequest request, String root, String=
title, String serverName, String key,
- String descr, Locale locale, String admin, Stri=
ng adminPass, Properties adminProps, String templates, File fileImport, boo=
lean asAJob) throws Exception {
+ String descr, Locale locale, String admin, Stri=
ng adminPass, Properties adminProps, String templates, File fileImport, Str=
ing fileImportName, boolean asAJob) throws Exception {
JahiaBaseACL acl =3D null;
acl =3D new JahiaBaseACL();
acl.create(0);
@@ -2278,6 +2285,7 @@
} else {
request.setAttribute("firstImport", "fileImport");
request.setAttribute("fileImport", fileImport);
+ request.setAttribute("fileImportName", fileImportName);
}
request.setAttribute("asAJob", Boolean.valueOf(asAJob));
=
Modified: trunk/core/src/java/org/jahia/engines/importexport/ManageImportEx=
port.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/importexport/ManageImportExport.java&rev=3D18588&repname=
=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/engines/importexport/ManageImportExport.j=
ava (original)
+++ trunk/core/src/java/org/jahia/engines/importexport/ManageImportExport.j=
ava Fri Sep 21 10:33:59 2007
@@ -254,7 +254,7 @@
}
} =
jobDataMap.put(ImportJob.URI, path + "/" + uploadname);
- jobDataMap.put(ImportJob.FILENAME, file.getName());
+ jobDataMap.put(ImportJob.FILENAME, fupload.getFileSyst=
emName(file.getName()));
jobDataMap.put(ImportJob.CONTENT_TYPE, contentType);
=
schedulerServ.scheduleJobNow(jobDetail);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
