cvs commit: jahia/src/java/org/jahia/services/search JahiaSearchResultHandlerImpl.java

[Khue Nguyen]

knguyen     2005/06/03 12:56:57 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/services/search 
                                       JahiaSearchResultHandlerImpl.java 
  Log:
  - give more info on background indexation
  - cluster issue
  
  Revision     Changes    Path
  1.2.2.7.2.4  +7 -2      
jahia/src/java/org/jahia/services/search/JahiaSearchResultHandlerImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/JahiaSearchResultHandlerImpl.java.diff?r1=1.2.2.7.2.3&r2=1.2.2.7.2.4&f=h
  
  
  
  Index: JahiaSearchResultHandlerImpl.java
  ===================================================================
  RCS file: 
/cvs/jahia/src/java/org/jahia/services/search/Attic/JahiaSearchResultHandlerImpl.java,v
  retrieving revision 1.2.2.7.2.3
  retrieving revision 1.2.2.7.2.4
  diff -u -r1.2.2.7.2.3 -r1.2.2.7.2.4
  --- JahiaSearchResultHandlerImpl.java 3 Jun 2005 10:29:20 -0000       
1.2.2.7.2.3
  +++ JahiaSearchResultHandlerImpl.java 3 Jun 2005 10:56:57 -0000       
1.2.2.7.2.4
  @@ -78,8 +78,7 @@
   
        Hashtable hitScores = new Hashtable();
   
  -     JahiaSearchResult result =
  -           new JahiaSearchResult (this,parsedObjects);
  +         JahiaSearchResult result = new JahiaSearchResult (this,null);
   
          if (parsedObjects == null || parsedObjects.isEmpty())
              return result;
  @@ -120,6 +119,7 @@
               }
           }
   
  +        Vector effectiveParsedObjects = new Vector();
          iterator = filteredDocument.values().iterator();
          while ( iterator.hasNext() ){
              info = null;
  @@ -169,6 +169,9 @@
                          JahiaBaseACL acl = new JahiaBaseACL 
(contentField.getAclID ());
                          if (aPage != null && aPage.checkReadAccess 
(currentUser)
                                  && acl.getPermission (currentUser, 
JahiaBaseACL.READ_RIGHTS)) {
  +
  +                           effectiveParsedObjects.add(parsedObject);
  +
                              found = false;
                              for (int j = 0; j < result.getHitCount(); j++) { 
// page already found
                                  JahiaSearchHit searchHit = (JahiaSearchHit)
  @@ -330,6 +333,8 @@
              }
          }
   
  +        result.setParsedObjects(effectiveParsedObjects);
  +
          // sort the result
          if (result.getHitCount () > 1) {
              Collections.sort(result.results ());