Peter M. Groen / knowledgetree

Commit 06b6d973c53b51cee2187b0556cd801f1c6c3a8d

Authored by kevin_fourie
1 parent 01a08cab

Merged in from DEV trunk... 

KTS-3172
"Indexer should default to JavaXMLRPCLuceneIndexer in dmsDefaults"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

KTS-3159
"CLONE -3.5.2 Upgrade - INFO: Scheduler - Background tasks errors(SUP-636)"
Fixed. 

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

KTS-3171
"Add extra validation for Permission::userIsSystemAdministrator()"
Updated.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8268 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 7 additions and 1 deletions
config/dmsDefaults.php
  View file @06b6d97
@@ -521,7 +521,7 @@ function catchFatalErrors($p_OnOff='On'){ @@ -521,7 +521,7 @@ function catchFatalErrors($p_OnOff='On'){
521 $oKTConfig->setdefaultns('search', 'resultsPerPage', 25); 521 $oKTConfig->setdefaultns('search', 'resultsPerPage', 25);
522 $oKTConfig->setdefaultns('search', 'dateFormat', 'Y-m-d'); 522 $oKTConfig->setdefaultns('search', 'dateFormat', 'Y-m-d');
523 523
524 - $oKTConfig->setdefaultns('indexer', 'coreClass', 'PHPLuceneIndexer'); 524 + $oKTConfig->setdefaultns('indexer', 'coreClass', 'JavaXMLRPCLuceneIndexer');
525 $oKTConfig->setdefaultns('indexer', 'batchDocuments', 20); 525 $oKTConfig->setdefaultns('indexer', 'batchDocuments', 20);
526 $oKTConfig->setdefaultns('indexer', 'batchMigrateDocuments', 500); 526 $oKTConfig->setdefaultns('indexer', 'batchMigrateDocuments', 500);
527 $oKTConfig->setdefaultns('indexer', 'indexingBasePath', '${searchBasePath}/indexing'); 527 $oKTConfig->setdefaultns('indexer', 'indexingBasePath', '${searchBasePath}/indexing');
search2/indexing/extractors/PDFExtractor.inc.php
  View file @06b6d97
@@ -67,6 +67,12 @@ class PDFExtractor extends ApplicationExtractor @@ -67,6 +67,12 @@ class PDFExtractor extends ApplicationExtractor
67 return true; 67 return true;
68 } 68 }
69 69
  70 + if (false === $res && (strpos($this->output, '(continuing anyway)') !== false))
  71 + {
  72 + $this->output = '';
  73 + return true;
  74 + }
  75 +
70 return $res; 76 return $res;
71 77
72 } 78 }