tdraier 2005/12/22 17:53:38 CET
Modified files:
core/src/java/org/jahia/services/importexport
ImportExportBaseService.java
Log:
fixed loadrequest in export
Revision Changes Path
1.59 +6 -3
jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java.diff?r1=1.58&r2=1.59&f=h
Index: ImportExportBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ImportExportBaseService.java 21 Dec 2005 14:49:01 -0000 1.58
+++ ImportExportBaseService.java 22 Dec 2005 16:53:38 -0000 1.59
@@ -183,7 +183,7 @@
public void export(ContentObject object, String languageCode,
ContentHandler h, Set files, ProcessingContext jParams, Set included,
EntryLoadRequest toLoadRequest, EntryLoadRequest fromLoadRequest, boolean link)
throws JahiaException, SAXException {
Map froms = new HashMap();
froms.put(null, fromLoadRequest);
- export(object, languageCode, h, files, jParams, included,
EntryLoadRequest.CURRENT, froms, link);
+ export(object, languageCode, h, files, jParams, included,
toLoadRequest, froms, link);
}
public void export(ContentObject object, String language, ContentHandler
h, Set files, ProcessingContext jParams, Set included, EntryLoadRequest
toLoadRequest, Map froms, boolean link) throws JahiaException, SAXException {
@@ -424,10 +424,10 @@
attr.addAttribute(JAHIA_URI, "diff", "jahia:diff", "CDATA",
changedStatus);
}
- if (!link) {
+// if (!link) {
JahiaBaseACL acl = object.getACL();
exportAcl(acl, "acl", attr, top);
- }
+// }
if (link) {
attr.addAttribute(JAHIA_URI, "linkkey", "jahia:linkkey",
"CDATA", object.getObjectKey().toString());
@@ -926,12 +926,15 @@
// Copy first lang only
ImportHandler handler = new ImportHandler(parentDest,jParams,
lang);
handler.setCopyUuid(link);
+ handler.setCopyReadAccessOnly(true);
export(source, lang, handler, null, jParams, null, loadRequest,
(EntryLoadRequest)null, link);
ContentObject main = handler.getLastObject();
for (;iterator.hasNext();) {
String nextLang = (String) iterator.next();
handler = new ImportHandler(main, jParams, nextLang);
handler.setUpdateOnly(true);
+ handler.setCopyUuid(link);
+ handler.setCopyReadAccessOnly(true);
export(source, nextLang, handler, null, jParams, null,
loadRequest, (EntryLoadRequest)null, link);
}
if (link) {
