gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 05:31:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use better error msg, use abstract class for full text search

Browse Source
This commit is contained in:
Uwe Steinmann 2016-12-06 18:00:14 +01:00
parent 5b459a187d
commit 12d241fa68
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
op/op.Ajax.php
View File

@ -335,7 +335,7 @@ switch($command) {
add_log_line(); add_log_line();
} else { } else {
header('Content-Type: application/json'); header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error removing folder', 'data'=>'')); echo json_encode(array('success'=>false, 'message'=>getMLText('error_remove_folder'), 'data'=>''));
} }
} else { } else {
header('Content-Type: application/json'); header('Content-Type: application/json');
@ -400,7 +400,7 @@ switch($command) {
add_log_line(); add_log_line();
} else { } else {
header('Content-Type: application/json'); header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>'')); echo json_encode(array('success'=>false, 'message'=>getMLText('error_remove_document'), 'data'=>''));
} }
} else { } else {
header('Content-Type: application/json'); header('Content-Type: application/json');
@ -649,15 +649,10 @@ switch($command) {
} }
} }
if($settings->_enableFullSearch) { if($settings->_enableFullSearch) {
if(!empty($settings->_luceneClassDir)) $index = $indexconf['Indexer']::open($settings->_luceneDir);
require_once($settings->_luceneClassDir.'/Lucene.php');
else
require_once('SeedDMS/Lucene.php');
$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
if($index) { if($index) {
SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile); $indexconf['Indexer']::init($settings->_stopWordsFile);
$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true)); $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText)));
} }
} }