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

[Khue Nguyen]

knguyen     2005/08/30 11:49:06 CEST

  Modified files:
    core/src/java/org/jahia/services/search 
                                            JahiaSearchBaseService.java 
  Log:
  - search indexation can be disabled
  
  Revision  Changes    Path
  1.18      +38 -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.17&r2=1.18&f=h
  
  
  
  Index: JahiaSearchBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JahiaSearchBaseService.java       22 Aug 2005 08:40:36 -0000      1.17
  +++ JahiaSearchBaseService.java       30 Aug 2005 09:49:05 -0000      1.18
  @@ -70,6 +70,8 @@
   
       private SchedulerService schedulerService;
   
  +    private boolean disabled = false;
  +
       public void setSchedulerService(SchedulerService schedulerService) {
           this.schedulerService = schedulerService;
       }
  @@ -99,6 +101,15 @@
       public void setSearchConfigProps(Properties searchConfigProps) {
           this.searchConfigProps = searchConfigProps;
       }
  +
  +    public boolean isDisabled() {
  +        return disabled;
  +    }
  +
  +    public void setDisabled(boolean disabled) {
  +        this.disabled = disabled;
  +    }
  +
       
//--------------------------------------------------------------------------
       /**
        * Initialization
  @@ -233,6 +244,10 @@
                                            boolean stagingOnly,
                                            ProcessingContext jParams) {
   
  +        if ( this.disabled ){
  +            return;
  +        }
  +
           ServicesRegistry sReg = ServicesRegistry.getInstance ();
   
           try {
  @@ -287,6 +302,10 @@
        */
       public synchronized void addFieldToSearchEngine (JahiaField aField,
                                                        int workflowState) {
  +        if ( this.disabled ){
  +            return;
  +        }
  +
           if (aField == null)
               return;
   
  @@ -331,6 +350,11 @@
        * @param aField the field to remove.
        */
       public synchronized void removeFieldFromSearchEngine (JahiaField aField) 
{
  +
  +        if ( this.disabled ){
  +            return;
  +        }
  +
           if (aField == null)
               return;
           RemovableDocumentImpl doc = new 
RemovableDocumentImpl(JahiaSearchConstant.FIELD_FIELDID,
  @@ -347,6 +371,11 @@
        */
       public synchronized void removeFieldFromSearchEngine (ContentField
               contentField) {
  +
  +        if ( this.disabled ){
  +            return;
  +        }
  +
           if (contentField == null)
               return;
   
  @@ -370,6 +399,10 @@
                                                             int workflowState,
                                                             String 
languageCode) {
   
  +        if ( this.disabled ){
  +            return;
  +        }
  +
           int wfState = workflowState;
           if (wfState > EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
               wfState = EntryLoadRequest.STAGING_WORKFLOW_STATE;
  @@ -423,6 +456,10 @@
        */
       public boolean indexSite (int siteId, ProcessingContext jParams) {
   
  +        if ( this.disabled ){
  +            return false;
  +        }
  +
           boolean result = false;
           // start the chrono...
           long startTime = JahiaChrono.getInstance ().start ();
  @@ -495,7 +532,7 @@
        */
       public boolean optimizeIndex (int siteID) {
           return true;
  -        }
  +    }
   
       
//--------------------------------------------------------------------------
       /**