Author: sshyrkov
Date: Tue Nov 27 17:06:17 2007
New Revision: 19300
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19300&repname=
=3Djahia
Log:
VOD-54: Content picker fails to import import the content because f missing=
container definiions (they were removed from templates in the meanwhile)
Resolution: check for missing container definitions and write out a warning=
message
Modified:
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/importexport/ImportHandler.java
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/s=
ervices/importexport/ImportHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/java/org/jahia/services/importexport/ImportHa=
ndler.java&rev=3D19300&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
--- branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/importexport/ImportHandler.java (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/importexport/ImportHandler.java Tue Nov 27 17:06:17 2007
@@ -892,15 +892,31 @@
}
=
if (def !=3D null && parent instanceof ContentContainer) {
- JahiaContainerDefinition parentDef =3D JahiaContainerDefin=
itionsRegistry.getInstance().getDefinition(ctnDefId);
- JahiaContainerSubDefinition parentSd =3D (JahiaContainerSu=
bDefinition) parentDef.getSubDefs().get(new Integer(pageDefId));
- List struct =3D parentSd.getStructure();
boolean found =3D false;
- for (Iterator iterator =3D struct.iterator(); iterator.has=
Next() && !found;) {
- ContentDefinition contentDefinition =3D (ContentDefini=
tion) ((JahiaContainerStructure) iterator.next()).getObjectDef();
- if (contentDefinition.getObjectKey().equals(def.getObj=
ectKey())) {
- found =3D true;
+ JahiaContainerDefinition parentDef =3D JahiaContainerDefin=
itionsRegistry.getInstance().getDefinition(ctnDefId);
+ if (parentDef !=3D null) {
+ JahiaContainerSubDefinition parentSd =3D (JahiaContain=
erSubDefinition) parentDef.getSubDefs().get(new Integer(pageDefId));
+ if (parentSd !=3D null && parentSd.getStructure() !=3D=
null) {
+ List struct =3D parentSd.getStructure();
+ for (Iterator iterator =3D struct.iterator(); iter=
ator.hasNext() && !found;) {
+ ContentDefinition contentDefinition =3D (Conte=
ntDefinition) ((JahiaContainerStructure) iterator.next()).getObjectDef();
+ if (contentDefinition.getObjectKey().equals(de=
f.getObjectKey())) {
+ found =3D true;
+ }
+ }
+ } else {
+ logger
+ .warn("Container definition cannot be foun=
d for container definition '"
+ + parentDef.getName()
+ + "' with ID=3D"
+ + ctnDefId
+ + " and page definition ID=3D"
+ + pageDefId);
}
+ } else {
+ logger
+ .warn("Container definition cannot be found fo=
r container ID: "
+ + ctnDefId);
}
if (!found) {
isContainerList =3D false;
@@ -930,9 +946,27 @@
=
List struct =3D null;
if (parent instanceof ContentContainer) {
- JahiaContainerDefinition parentDef =3D JahiaContainerD=
efinitionsRegistry.getInstance().getDefinition(ctnDefId);
- JahiaContainerSubDefinition sd =3D (JahiaContainerSubD=
efinition) parentDef.getSubDefs().get(new Integer(pageDefId));
- struct =3D sd.getStructure();
+ JahiaContainerDefinition parentDef =3D JahiaContainerD=
efinitionsRegistry
+ .getInstance().getDefinition(ctnDefId);
+ if (parentDef !=3D null) {
+ JahiaContainerSubDefinition sd =3D (JahiaContainer=
SubDefinition) parentDef
+ .getSubDefs().get(new Integer(pageDefId));
+ if (sd !=3D null) {
+ struct =3D sd.getStructure();
+ } else {
+ logger
+ .warn("Container definition cannot be found fo=
r container definition '"
+ + parentDef.getName()
+ + "' with ID=3D"
+ + ctnDefId
+ + " and page definition ID=3D"
+ + pageDefId);
+ }
+ } else {
+ logger
+ .warn("Container definition cannot be foun=
d for container ID=3D"
+ + ctnDefId);
+ } =
} else {
Vector definitions =3D JahiaContainerDefinitionsRegist=
ry.getInstance().getDefinitionsInTemplate(pageDefId);
for (int i =3D 0; i < definitions.size() && struct=3D=
=3Dnull; i++) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
