knguyen 2006/01/04 13:23:59 CET
Modified files:
core/src/java/org/jahia/services/search
JahiaSearchBaseService.java
Log:
- execute indexing jobs only if related content objects still exist
Revision Changes Path
1.44 +20 -18
jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java.diff?r1=1.43&r2=1.44&f=h
Index: JahiaSearchBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- JahiaSearchBaseService.java 23 Dec 2005 15:42:33 -0000 1.43
+++ JahiaSearchBaseService.java 4 Jan 2006 12:23:58 -0000 1.44
@@ -366,28 +366,30 @@
toAdd = new ArrayList();
job = (JahiaIndexingJob) jobs.next();
siteID = job.getSiteId();
- user = (JahiaUser)cachedAdminUsers.get(siteID);
- if ( user == null ){
- user = getAdminUser(siteID.intValue());
- if ( user != null ){
- cachedAdminUsers.put(siteID,user);
+ if ( job.isValid() ){
+ user = (JahiaUser)cachedAdminUsers.get(siteID);
+ if ( user == null ){
+ user = getAdminUser(siteID.intValue());
+ if ( user != null ){
+ cachedAdminUsers.put(siteID,user);
+ }
}
- }
- job.prepareBatchIndexation(toRemove,toAdd,user);
+ job.prepareBatchIndexation(toRemove,toAdd,user);
- docsList = (List)sitesToRemove.get(job.getSiteId());
- if ( docsList == null ){
- docsList = new ArrayList();
- sitesToRemove.put(job.getSiteId(),docsList);
- }
- docsList.addAll(toRemove);
+ docsList =
(List)sitesToRemove.get(job.getSiteId());
+ if ( docsList == null ){
+ docsList = new ArrayList();
+ sitesToRemove.put(job.getSiteId(),docsList);
+ }
+ docsList.addAll(toRemove);
- docsList = (List)sitesToAdd.get(job.getSiteId());
- if ( docsList == null ){
- docsList = new ArrayList();
- sitesToAdd.put(job.getSiteId(),docsList);
+ docsList = (List)sitesToAdd.get(job.getSiteId());
+ if ( docsList == null ){
+ docsList = new ArrayList();
+ sitesToAdd.put(job.getSiteId(),docsList);
+ }
+ docsList.addAll(toAdd);
}
- docsList.addAll(toAdd);
}
iterator = sitesToRemove.keySet().iterator();
siteId = null;
