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

[Khue Nguyen]

knguyen     2005/12/21 15:05:14 CET

  Modified files:
    core/src/java/org/jahia/services/search 
                                            JahiaSearchBaseService.java 
  Log:
  - fix JIRA-602 , add $context for relative path to the webapp context
  
  Revision  Changes    Path
  1.40      +8 -0      
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.39&r2=1.40&f=h
  
  
  
  Index: JahiaSearchBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- JahiaSearchBaseService.java       20 Dec 2005 17:33:54 -0000      1.39
  +++ JahiaSearchBaseService.java       21 Dec 2005 14:05:14 -0000      1.40
  @@ -57,6 +57,7 @@
   import org.jahia.services.version.ContentObjectEntryState;
   import org.jahia.services.version.EntryLoadRequest;
   import org.jahia.utils.JahiaChrono;
  +import org.jahia.utils.JahiaTools;
   import org.jahia.bin.Jahia;
   import org.quartz.JobDetail;
   import org.quartz.SimpleTrigger;
  @@ -164,6 +165,12 @@
   
           String val = 
config.getProperty("org.jahia.services.search.searchIndexRootDir");
           if (val != null) {
  +            val = JahiaTools.convertContexted (val,
  +                    Jahia.getSettings().getPathResolver());
  +            File f = new File(val);
  +            if ( f.isDirectory() ){
  +                searchIndexesDiskPath = val;
  +            } else {
               if (val.startsWith("/")) {
                   searchIndexesDiskPath = org.jahia.bin.Jahia.
                           getStaticServletConfig()
  @@ -171,6 +178,7 @@
               } else {
                   searchIndexesDiskPath = val;
               }
  +            }
           } else {
               // the default
               searchIndexesDiskPath = settingsBean.getJahiaVarDiskPath()