Author: tdraier
Date: Thu Jul 12 11:24:21 2007
New Revision: 17948
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17948&repname=
=3Djahia
Log:
import optimizations (port 17934)
Modified:
trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportHandler=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportHandler.java&rev=3D17948&repname=3Djah=
ia
=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/ImportHandler.java =
(original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java =
Thu Jul 12 11:24:21 2007
@@ -1427,22 +1427,15 @@
}
=
if (object instanceof ContentContainerList) {
- boolean modified =3D false;
- JahiaContainerList containerList =3D ((ContentContainerList)ob=
ject).getJahiaContainerList(jParams, elr);
for(int i =3D 0; i<atts.getLength(); i++) {
if ( ImportExportBaseService.JAHIA_URI.equals(atts.getURI(=
i)) && atts.getLocalName(i).startsWith("view_field_acl_") ) {
JahiaBaseACL newAcl =3D null;
newAcl =3D new JahiaBaseACL ();
- newAcl.create (containerList.getAclID ());
- containerList.setProperty (atts.getLocalName(i), Strin=
g.valueOf (newAcl.getID ()));
+ newAcl.create (object.getAclID ());
+ object.setProperty (atts.getLocalName(i), String.value=
Of (newAcl.getID ()));
fillAcl(newAcl, atts.getValue(i), false);
- modified =3D true;
}
}
- if (modified) {
- ServicesRegistry.getInstance ().getJahiaContainersService =
().
- saveContainerListInfo (containerList, object.getPa=
rent(null).getAclID(),jParams);
- }
}
}
=
@@ -1603,8 +1596,16 @@
=
Collection md =3D fieldDefs.keySet();
ObjectKey objectKey =3D object.getObjectKey();
+ List metadatas =3D object.getMetadatas();
+ Map metadataMap =3D new HashMap();
+ for (Iterator iterator =3D metadatas.iterator(); iterator.hasN=
ext();) {
+ ContentField contentField =3D (ContentField) iterator.next=
();
+ metadataMap.put(new Integer(contentField.getDefinitionID(n=
ull)), contentField);
+ }
+ JahiaSaveVersion saveVersion =3D new JahiaSaveVersion(false, f=
alse);
for (Iterator iterator =3D md.iterator(); iterator.hasNext();)=
{
String metadataName =3D (String) iterator.next();
+ JahiaFieldDefinition def =3D (JahiaFieldDefinition) fieldD=
efs.get(metadataName);
String value;
if (CoreMetadataConstant.CREATION_DATE.equals(metadataName=
)) {
value =3D attr.getValue(ImportExportBaseService.JCR_UR=
I, "created");
@@ -1623,10 +1624,8 @@
JahiaFieldDefinition fieldDef =3D (JahiaFieldDefinitio=
n) fieldDefs.get(metadataName);
=
String fieldValue =3D parseValue(fieldDef.getType(0), =
value);
-
- ContentField metadataContentField =3D object.getMetada=
ta(metadataName);
+ ContentField metadataContentField =3D (ContentField) m=
etadataMap.get(new Integer(fieldDef.getID()));
if (metadataContentField =3D=3D null) {
- JahiaSaveVersion saveVersion =3D ServicesRegistry.=
getInstance().getJahiaVersionService().getSiteSaveVersion(0);
JahiaField field =3D ServicesRegistry.getInstance(=
).getJahiaFieldService().createJahiaField(0, jParams.getSiteID(), 0,
0, fieldDef.getID(),fieldDef.getType(0),0,=
fieldValue, 0, 0,saveVersion.getVersionID(),saveVersion.getWorkflowState()=
,language);
if (field !=3D null) {
@@ -1698,11 +1697,9 @@
rule.setInherited(Boolean.FALSE);
rule.setShared(Boolean.TRUE);
} else {
- if ( rule =3D=3D null ) {
- RetentionRuleDef baseDef =3D timeBasedPublishi=
ngService.getBaseRetentionRuleDef();
- rule =3D baseDef.createRule();
+ if (rule !=3D null) {
+ rule.setInherited(Boolean.TRUE);
}
- rule.setInherited(Boolean.TRUE);
}
}
try {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
