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

[Khue Nguyen]

knguyen     2004/08/25 16:45:58 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/search AddedField.java 
                                       JahiaSearchBaseService.java 
  Log:
  - Load balanced search engine support, while still using file index
  
  Revision  Changes    Path
  1.14.2.1  +2 -1      jahia/src/java/org/jahia/services/search/AddedField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/AddedField.java.diff?r1=1.14&r2=1.14.2.1&f=h
  1.42.2.5  +3 -5      
jahia/src/java/org/jahia/services/search/JahiaSearchBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/JahiaSearchBaseService.java.diff?r1=1.42.2.4&r2=1.42.2.5&f=h
  
  
  
  Index: AddedField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/search/Attic/AddedField.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- AddedField.java   17 Mar 2004 12:31:15 -0000      1.14
  +++ AddedField.java   25 Aug 2004 14:45:58 -0000      1.14.2.1
  @@ -30,6 +30,7 @@
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.util.*;
  +import java.io.Serializable;
   
   /**
    * <p>Title: This class represents a field wrapper used by search engine</p>
  @@ -40,7 +41,7 @@
    * @author Khue Nguyen
    * @version 1.0
    */
  -class AddedField extends JahiaIndexableDocumentImpl {
  +class AddedField extends JahiaIndexableDocumentImpl implements Serializable {
   
       private static org.apache.log4j.Logger logger =
               org.apache.log4j.Logger.getLogger (AddedField.class);
  
  
  
  Index: JahiaSearchBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/search/Attic/JahiaSearchBaseService.java,v
  retrieving revision 1.42.2.4
  retrieving revision 1.42.2.5
  diff -u -r1.42.2.4 -r1.42.2.5
  --- JahiaSearchBaseService.java       25 Aug 2004 14:21:28 -0000      1.42.2.4
  +++ JahiaSearchBaseService.java       25 Aug 2004 14:45:58 -0000      1.42.2.5
  @@ -1120,13 +1120,11 @@
        * @param cacheName String
        * @param entryKey Object
        */
  +
       public void onCachePut (String cacheName, Object entryKey, Object entryValue){
           if ( this.SEARCH_INDEX_ORDERS_CACHE.equals(cacheName)
  -             && entryKey != null ){
  -            Object obj = this.indexOrdersCache.get(entryKey);
  -            if ( obj != null ){
  -                this.indexOrders.add(obj);
  -            }
  +             && entryKey != null && entryValue != null ){
  +            this.indexOrders.add(entryValue);
           }
       }