knguyen 2006/01/04 13:23:21 CET
Modified files:
core/src/java/org/jahia/hibernate/model/indexingjob
JahiaContainerIndexingJob.java
JahiaContainerListIndexingJob.java
JahiaFieldIndexingJob.java
JahiaIndexingJob.java
JahiaPageIndexingJob.java
JahiaRemoveFromIndexJob.java
Log:
- execute indexing jobs only if related content objects still exist
Revision Changes Path
1.5 +13 -0
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerIndexingJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerIndexingJob.java.diff?r1=1.4&r2=1.5&f=h
1.4 +13 -0
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerListIndexingJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerListIndexingJob.java.diff?r1=1.3&r2=1.4&f=h
1.4 +13 -0
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaFieldIndexingJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaFieldIndexingJob.java.diff?r1=1.3&r2=1.4&f=h
1.8 +7 -0
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java.diff?r1=1.7&r2=1.8&f=h
1.4 +13 -0
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaPageIndexingJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaPageIndexingJob.java.diff?r1=1.3&r2=1.4&f=h
1.4 +9 -0
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaRemoveFromIndexJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaRemoveFromIndexJob.java.diff?r1=1.3&r2=1.4&f=h
Index: JahiaContainerIndexingJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerIndexingJob.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaContainerIndexingJob.java 20 Dec 2005 17:33:54 -0000 1.4
+++ JahiaContainerIndexingJob.java 4 Jan 2006 12:23:20 -0000 1.5
@@ -66,6 +66,19 @@
this.siteId = siteId;
}
+ /**
+ * Check if the container exists or not
+ *
+ * @return true if the job is executable. If false, the job should be
discarded
+ */
+ public boolean isValid(){
+ try {
+ return ( ContentContainer.getContainer(this.ctnId.intValue()) !=
null );
+ } catch (Throwable t){
+ }
+ return false;
+ }
+
public void execute(JahiaUser user){
if ( ctnId != null ){
ServicesRegistry.getInstance().getJahiaSearchService()
Index: JahiaContainerListIndexingJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerListIndexingJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaContainerListIndexingJob.java 20 Dec 2005 17:33:54 -0000
1.3
+++ JahiaContainerListIndexingJob.java 4 Jan 2006 12:23:20 -0000
1.4
@@ -65,6 +65,19 @@
this.siteId = siteId;
}
+ /**
+ * Check if the container list exists or not
+ *
+ * @return true if the job is executable. If false, the job should be
discarded
+ */
+ public boolean isValid(){
+ try {
+ return (
ContentContainerList.getContainerList(this.ctnListId.intValue()) != null );
+ } catch (Throwable t){
+ }
+ return false;
+ }
+
public void execute(JahiaUser user){
if ( ctnListId != null ){
ServicesRegistry.getInstance().getJahiaSearchService()
Index: JahiaFieldIndexingJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaFieldIndexingJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaFieldIndexingJob.java 20 Dec 2005 17:33:54 -0000 1.3
+++ JahiaFieldIndexingJob.java 4 Jan 2006 12:23:20 -0000 1.4
@@ -65,6 +65,19 @@
this.siteId = siteId;
}
+ /**
+ * Check if the field exists or not
+ *
+ * @return true if the job is executable. If false, the job should be
discarded
+ */
+ public boolean isValid(){
+ try {
+ return ( ContentField.getField(this.fieldId.intValue()) != null
);
+ } catch (Throwable t){
+ }
+ return false;
+ }
+
public void execute(JahiaUser user){
if ( fieldId != null ){
ServicesRegistry.getInstance().getJahiaSearchService()
Index: JahiaIndexingJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JahiaIndexingJob.java 20 Dec 2005 17:33:54 -0000 1.7
+++ JahiaIndexingJob.java 4 Jan 2006 12:23:20 -0000 1.8
@@ -104,6 +104,13 @@
public abstract Integer getSiteId();
+ /**
+ * Return true if the job is executable. If false, the job should be
discarded
+ *
+ * @return
+ */
+ public abstract boolean isValid();
+
public abstract void execute(JahiaUser user);
/**
Index: JahiaPageIndexingJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaPageIndexingJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaPageIndexingJob.java 20 Dec 2005 17:33:54 -0000 1.3
+++ JahiaPageIndexingJob.java 4 Jan 2006 12:23:20 -0000 1.4
@@ -66,6 +66,19 @@
}
/**
+ * Check if the page exists or not
+ *
+ * @return true if the job is executable. If false, the job should be
discarded
+ */
+ public boolean isValid(){
+ try {
+ return ( ContentPage.getPage(this.pageId.intValue()) != null );
+ } catch (Throwable t){
+ }
+ return false;
+ }
+
+ /**
*
*/
public void execute(JahiaUser user){
Index: JahiaRemoveFromIndexJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaRemoveFromIndexJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaRemoveFromIndexJob.java 20 Dec 2005 17:33:54 -0000 1.3
+++ JahiaRemoveFromIndexJob.java 4 Jan 2006 12:23:20 -0000 1.4
@@ -84,6 +84,15 @@
this.keyFieldValue = keyFieldValue;
}
+ /**
+ * by default, return true
+ *
+ * @return true if the job is executable. If false, the job should be
discarded
+ */
+ public boolean isValid(){
+ return true;
+ }
+
public void execute(JahiaUser user){
try {
ServicesRegistry.getInstance().getJahiaSearchService()
