cvs commit: jahia/core/src/java/org/jahia/services/search JahiaSearchBaseService.java

[Khue Nguyen]

knguyen     2005/12/01 12:29:47 CET

  Modified files:
    core/src/java/org/jahia/services/search 
                                            JahiaSearchBaseService.java 
  Log:
  - restore indexing job optimization removed by Thomas.
  
  Revision  Changes    Path
  1.34      +3 -1      
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.33&r2=1.34&f=h
  
  
  
  Index: JahiaSearchBaseService.java
  ===================================================================
  RCS file: 
/cvs/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- JahiaSearchBaseService.java       30 Nov 2005 19:24:17 -0000      1.33
  +++ JahiaSearchBaseService.java       1 Dec 2005 11:29:47 -0000       1.34
  @@ -47,6 +47,7 @@
   import org.jahia.services.scheduler.SchedulerService;
   import org.jahia.services.search.indexingscheduler.IndexingJob;
   import org.jahia.services.search.indexingscheduler.IndexingJobConsummer;
  +import org.jahia.services.search.indexingscheduler.IndexingJobTools;
   import org.jahia.services.search.indexingscheduler.impl.ContainerIndexingJob;
   import org.jahia.services.search.indexingscheduler.impl.FieldIndexingJob;
   import org.jahia.services.search.indexingscheduler.impl.PageIndexingJob;
  @@ -296,7 +297,8 @@
                   continue;
               }
               try {
  -                jobsList = 
this.indJobMgr.getIndexingJobsAfter(this.getLastIndexingJobTime(),false);
  +                jobsList = 
IndexingJobTools.resolveIndexingJobs(this.indJobMgr
  +                        
.getIndexingJobsAfter(this.getLastIndexingJobTime(),false));
                   Iterator jobs = jobsList.iterator();
                   if ( jobsList.size()>0 ){
                       while (jobs.hasNext()) {