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

[Khue Nguyen]

knguyen     2005/11/25 13:19:31 CET

  Modified files:
    core/src/java/org/jahia/services/search 
                                            JahiaSearchBaseService.java 
  Log:
  - evaluate expression when indexing
  
  Revision  Changes    Path
  1.30      +11 -2     
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.29&r2=1.30&f=h
  
  
  
  Index: JahiaSearchBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JahiaSearchBaseService.java       22 Nov 2005 18:16:43 -0000      1.29
  +++ JahiaSearchBaseService.java       25 Nov 2005 12:19:30 -0000      1.30
  @@ -60,6 +60,7 @@
   import org.jahia.services.version.ContentObjectEntryState;
   import org.jahia.services.version.EntryLoadRequest;
   import org.jahia.utils.JahiaChrono;
  +import org.jahia.bin.Jahia;
   import org.quartz.JobDetail;
   import org.quartz.SimpleTrigger;
   import org.jgroups.Address;
  @@ -823,8 +824,12 @@
                       return;
                   }
                   JahiaSite site = 
sReg.getJahiaSitesService().getSite(contentContainer.getSiteID());
  +
                   // init the JahiaContentContainer
  -                SerializableParamBean jParams = new 
SerializableParamBean(site, user);
  +                ProcessingContext jParams = new 
ProcessingContext(Jahia.getSettings(),
  +                        System.currentTimeMillis(), site, user,
  +                        ContentPage.getPage(contentContainer.getPageID()));
  +
                   JahiaContentContainerFacade containerFacade =
                           new JahiaContentContainerFacade(ctnId, 
LoadFlags.ALL, jParams,
                                   site.getLanguageSettingsAsLocales(true), 
false, false);
  @@ -1019,7 +1024,11 @@
   
                   boolean isMarkedForDelete = false;
                   JahiaSite site = 
ServicesRegistry.getInstance().getJahiaSitesService().getSite(contentField.getSiteID());
  -                SerializableParamBean jParams = new 
SerializableParamBean(site, user);
  +
  +                ProcessingContext jParams = new 
ProcessingContext(Jahia.getSettings(),
  +                        System.currentTimeMillis(), site, user,
  +                        ContentPage.getPage(contentField.getPageID()));
  +
                   ArrayList localeList = 
site.getLanguageSettingsAsLocales(true);
   
                   JahiaContentFieldFacade jahiaContentFieldFacade =