Using GENERATED_PATH

xong · Nov 23, 2013 · d2dbf57 · xong · Dec 8, 2013 · d2dbf57
1 parent e5e8ca5
commit d2dbf57
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/classes/class.rexsearch.inc.php b/classes/class.rexsearch.inc.php
@@ -59,6 +59,7 @@ class RexSearch
   var $includeColumns = array();
   var $includeDirectories = array();
   var $includePath;
+  var $generatedPath;
   var $indexUnknownFileExtensions = false;
   var $indexMediapool = false;
   var $indexMissingFileExtensions = false;
@@ -184,6 +185,7 @@ function RexSearch($_clang = false, $_loadSettings = true, $_useStopwords = true
     $this->languages = $REX['CLANG'];
     $this->tablePrefix = $REX['TABLE_PREFIX'];
     $this->includePath = $REX['INCLUDE_PATH'];
+    $this->generatedPath = $REX['GENERATED_PATH'];
     $this->utf8 = rex_lang_is_utf8();
     $this->documentRoot = realpath($_SERVER['DOCUMENT_ROOT']);
     $this->mediaFolder = $REX['MEDIAFOLDER'];
@@ -606,7 +608,7 @@ function indexArticle($_id,$_clang = false)
         {
           $rex_article = new rex_article(intval($_id), $langID);
 
-          $article_content_file = $this->includePath.'/generated/articles/'.$_id.'.'.$langID.'.content';
+          $article_content_file = $this->generatedPath.'/articles/'.$_id.'.'.$langID.'.content';
           if(!file_exists($article_content_file))
           {
             include_once ($this->includePath."/functions/function_rex_generate.inc.php");
@@ -838,7 +840,7 @@ function indexColumn($_table, $_column, $_idcol = false, $_id = false, $_start =
           {
             $rex_article = new rex_article(intval($value['id']), intval($value['clang']));
             $teaser = true;
-            $article_content_file = $this->includePath.'/generated/articles/'.intval($value['id']).'.'.intval($value['clang']).'.content';
+            $article_content_file = $this->generatedPath.'/articles/'.intval($value['id']).'.'.intval($value['clang']).'.content';
             if(!file_exists($article_content_file))
             {
               include_once ($this->includePath."/functions/function_rex_generate.inc.php");
@@ -946,7 +948,7 @@ function indexFile($_filename, $_doPlaintext = false, $_clang = false, $_fid = f
 
         if(function_exists('exec'))
         {
-          $tempFile = tempnam($this->includePath.'/generated/files/', 'rexsearch');
+          $tempFile = tempnam($this->generatedPath.'/files/', 'rexsearch');
 
           if($this->utf8)
             $encoding = 'UTF-8';