Merge pull request #368 from tyrant88/tyrant88-patch-124

Release 6.9.7
FriendsOfREDAXO · Mar 2, 2023 · 87809ee · 87809ee
2 parents 73ee2e0 + b24c216
commit 87809ee
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## Version 6.9.7 (2023-03-02)
+- Fixes in indexFile und pdf2txt Klasse
+
 ## Version 6.9.6 (2023-03-02)
 - Fixes for PHP 8.1
 - IndexColumn() indexiert jetzt wirklich nur einen Datensatz, wenn id gesetzt #364 thx @tbaddade 

diff --git a/lib/pdf2txt.php b/lib/pdf2txt.php
@@ -54,7 +54,7 @@ function convert($_data = false)
             return false;
         }
 
-        if ($this->data === false) {
+        if ($this->data === false || $this->data == null) {
             // [ ERROR ]
             // nothing to convert
             return false;

diff --git a/lib/search_it.php b/lib/search_it.php
@@ -892,8 +892,9 @@ public function indexColumn($_table, $_column, $_idcol = false, $_id = false, $_
      */
     public function indexFile($_filename, $_doPlaintext = false, $_clang = false, $_fid = false, $_catid = false, $clearCache = false): int
     {
-        // $_filename comes with path but stripped of first slash
+        // $_filename comes with path but needs to be stripped of first slash
         // extract file-extension
+        $_filename = ltrim($_filename, '/');
         $filenameArray = explode('.', $_filename);
         $fileext = $filenameArray[count($filenameArray) - 1];
 
@@ -939,8 +940,8 @@ public function indexFile($_filename, $_doPlaintext = false, $_clang = false, $_
                 if (function_exists('exec')) {
                     $tempFile = tempnam(rex_path::cache() . 'addons/mediapool/', 'search_it');
                     $encoding = 'UTF-8';
-                    //echo 'pdftotext ' . escapeshellarg(rex_path::base($_filename)) . ' ' . escapeshellarg($tempFile) . ' -enc ' . $encoding;
-                    exec('pdftotext  -enc ' . $encoding.' '. escapeshellarg(rex_path::base($_filename)) . ' ' . escapeshellarg($tempFile) , $dummy, $return);
+                    //echo 'pdftotext ' . escapeshellarg(rex_path::frontend($_filename)) . ' ' . escapeshellarg($tempFile) . ' -enc ' . $encoding;
+                    exec('pdftotext  -enc ' . $encoding.' '. escapeshellarg(rex_path::frontend($_filename)) . ' ' . escapeshellarg($tempFile) , $dummy, $return);
 
                     if ($return > 0) {
                         if ($return == 1) {
@@ -968,7 +969,7 @@ public function indexFile($_filename, $_doPlaintext = false, $_clang = false, $_
 
                 if (!$xpdf) {
                     // if xpdf returned an error, try pdf2txt via php
-                    if (false === $pdfContent = @rex_file::get(rex_path::base($_filename))) {
+                    if (false === $pdfContent = @rex_file::get(rex_path::frontend($_filename))) {
                         $error = SEARCH_IT_FILE_NOEXIST;
                     } else {
                         $text = pdf2txt::directConvert($pdfContent);
@@ -989,7 +990,7 @@ public function indexFile($_filename, $_doPlaintext = false, $_clang = false, $_
             case 'htm':
             case 'html':
             case 'php':
-                if (false === $text = @rex_file::get(rex_path::base($_filename))) {
+                if (false === $text = @rex_file::get(rex_path::frontend($_filename))) {
                     return SEARCH_IT_FILE_NOEXIST;
                 }
 
@@ -998,7 +999,7 @@ public function indexFile($_filename, $_doPlaintext = false, $_clang = false, $_
 
             // other filetype
             default:
-                if (false === $text = @rex_file::get(rex_path::base($_filename))) {
+                if (false === $text = @rex_file::get(rex_path::frontend($_filename))) {
                     return SEARCH_IT_FILE_NOEXIST;
                 }
 

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: search_it
-version: '6.9.6'
+version: '6.9.7'
 author: Friends Of REDAXO
 supportpage: https://github.com/FriendsOfREDAXO/search_it
 

diff --git a/plugins/autocomplete/package.yml b/plugins/autocomplete/package.yml
@@ -1,5 +1,5 @@
 package: search_it/autocomplete
-version: '6.9.6'
+version: '6.9.7'
 author: Manétage
 
 title: 'translate:search_it_autocomplete_plugin_title'

diff --git a/plugins/documentation/package.yml b/plugins/documentation/package.yml
@@ -1,5 +1,5 @@
 package: search_it/documentation
-version: '6.9.6'
+version: '6.9.7'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_documentation_title'

diff --git a/plugins/plaintext/package.yml b/plugins/plaintext/package.yml
@@ -1,5 +1,5 @@
 package: search_it/plaintext
-version: '6.9.6'
+version: '6.9.7'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_plaintext_title'

diff --git a/plugins/stats/package.yml b/plugins/stats/package.yml
@@ -1,5 +1,5 @@
 package: search_it/stats
-version: '6.9.6'
+version: '6.9.7'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_stats_plugin_title'