From be2de9cfc1d2935ceab4768e6cb0b1a08d403f2b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 19 Nov 2021 13:34:21 +0100 Subject: [PATCH] set cmd to class name of conversion service --- SeedDMS_Lucene/Lucene/IndexedDocument.php | 5 ++++- SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php index da292ed56..7dea13dd8 100644 --- a/SeedDMS_Lucene/Lucene/IndexedDocument.php +++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php @@ -182,11 +182,14 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document { $mimetype = $version->getMimeType(); $this->mimetype = $mimetype; if(is_object($convcmd) && (get_class($convcmd) == 'SeedDMS_ConversionMgr')) { - if($convcmd->hasService($mimetype, 'text/plain')) { + if($service = $convcmd->getService($mimetype, 'text/plain')) { $content = $convcmd->convert($path, $mimetype, 'text/plain'); if($content) { self::setContent($content); } + $this->cmd = get_class($service); + } else { + $this->cmd = 'No service to convert '.$mimetype.' to text/plain'; } } else { $content = ''; diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php index 0d76db463..ec8665470 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php @@ -182,12 +182,12 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document { $mimetype = $version->getMimeType(); $this->mimetype = $mimetype; if(is_object($convcmd) && (get_class($convcmd) == 'SeedDMS_ConversionMgr')) { - if($convcmd->hasService($mimetype, 'text/plain')) { + if($service = $convcmd->getService($mimetype, 'text/plain')) { $content = $convcmd->convert($path, $mimetype, 'text/plain'); if($content) { self::setContent($content); } - $this->cmd = get_class($convcmd); + $this->cmd = get_class($service); } else { $this->cmd = 'No service to convert '.$mimetype.' to text/plain'; }