svn commit: [jahia] r18487 - in /trunk/core/src/java/org/jahia/services/metadata/core/listeners: ContentLastContributorListener.java ContentLastModificationDateListener.java

[tdraier]

Author: tdraier
Date: Fri Sep 14 13:31:51 2007
New Revision: 18487

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18487&repname=
=3Djahia
Log:
create modificationdate and lastcontributor metadata if not present in impo=
rt (JAHIA-2216)(port 18339)

Modified:
    trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astContributorListener.java
    trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astModificationDateListener.java

Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentLastContributorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentLastContributorListener.ja=
va&rev=3D18487&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/services/metadata/core/listeners/ContentL=
astContributorListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astContributorListener.java Fri Sep 14 13:31:51 2007
@@ -38,6 +38,7 @@
 import org.jahia.services.containers.ContentContainer;
 import org.jahia.services.containers.ContentContainerList;
 import org.jahia.services.importexport.ImportHandler;
+import org.jahia.exceptions.JahiaException;
 =

 import java.util.HashMap;
 =

@@ -162,9 +163,6 @@
     }
 =

     protected void handleObjectChanged(JahiaEvent theEvent, boolean conten=
tCreated) {
-        if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
-            return;
-        }
         Object eventObject =3D theEvent.getObject();
         ContentObject contentObject =3D null;
         if ( eventObject instanceof JahiaContainer ){
@@ -183,6 +181,20 @@
         if (contentObject instanceof ContentField && ((ContentField) conte=
ntObject).getContainerID() !=3D 0) {
             return;
         }
+
+        if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
+            try {
+                JahiaField jahiaField =3D contentObject.getMetadataAsJahia=
Field(this.getMetadataName(), theEvent.getProcessingContext());
+                if ( jahiaField =3D=3D null ){
+                    return;
+                }
+                if (jahiaField.getValue() !=3D null && !jahiaField.getValu=
e().equals("")) {
+                    return;
+                }
+            } catch (JahiaException e) {
+            }
+        }
+
         Long lastUpdateTime;
         synchronized (lastUpdateTimeMap) {
             lastUpdateTime =3D getLastUpdateTime(contentObject.getObjectKe=
y());

Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentLastModificationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentLastModificationDateListen=
er.java&rev=3D18487&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/services/metadata/core/listeners/ContentL=
astModificationDateListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentL=
astModificationDateListener.java Fri Sep 14 13:31:51 2007
@@ -147,9 +147,7 @@
     }
 =

     public void handleObjectChanged(JahiaEvent theEvent) {
-        if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
-            return;
-        }
+
         Object eventObject =3D theEvent.getObject();
         ContentObject contentObject =3D null;
         if ( eventObject instanceof JahiaContainer){
@@ -169,6 +167,19 @@
             return;
         }
 =

+        if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
+            try {
+                JahiaField jahiaField =3D contentObject.getMetadataAsJahia=
Field(this.getMetadataName(), theEvent.getProcessingContext());
+                if ( jahiaField =3D=3D null ){
+                    return;
+                }
+                if (jahiaField.getValue() !=3D null && !jahiaField.getValu=
e().equals("")) {
+                    return;
+                }
+            } catch (JahiaException e) {
+            }
+        }
+
         Long lastUpdateTime;
         synchronized (lastUpdateTimeMap) {
             lastUpdateTime =3D (Long) lastUpdateTimeMap.get(contentObject.=
getObjectKey());

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list