Peter M. Groen / knowledgetree

Commit 9748abea49025e52623a7a4abd98fd9308de339f

Authored by kevin_fourie
1 parent 3a707f50

Merged in from DEV trunk... 

KTS-673
"The search algorithm needs some work"
Updated. Undo lockfile on main indexing

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

KTS-673
"The search algorithm needs some work"
Updated. added zseq_mime_extractors id

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7565 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 17 additions and 16 deletions
search2/indexing/indexerCore.inc.php
  View file @9748abe
... ... @@ -714,14 +714,14 @@ abstract class Indexer
714 714 global $default;
715 715 $config =& KTConfig::getSingleton();
716 716  
717   - $indexLockFile = $config->get('cache/cacheDirectory') . '/main.index.lock';
  717 + /*$indexLockFile = $config->get('cache/cacheDirectory') . '/main.index.lock';
718 718 if (is_file($indexLockFile))
719 719 {
720 720 $default->log->info('indexDocuments: main.index.lock seems to exist. it could be that the indexing is still underway.');
721 721 $default->log->info('indexDocuments: Remove "' . $indexLockFile . '" if the indexing is not running or extend the frequency at which the background task runs!');
722 722 return;
723 723 }
724   - touch($indexLockFile);
  724 + touch($indexLockFile);*/
725 725  
726 726  
727 727 $this->checkForRegisteredTypes();
... ... @@ -729,7 +729,7 @@ abstract class Indexer
729 729 $default->log->info('indexDocuments: start');
730 730 if (!$this->doesDiagnosticsPass())
731 731 {
732   - unlink($indexLockFile);
  732 + //unlink($indexLockFile);
733 733 return;
734 734 }
735 735  
... ... @@ -761,14 +761,14 @@ abstract class Indexer
761 761 $result = DBUtil::getResultArray($sql);
762 762 if (PEAR::isError($result))
763 763 {
764   - unlink($indexLockFile);
  764 + //unlink($indexLockFile);
765 765 return;
766 766 }
767 767  
768 768 // bail if no work to do
769 769 if (count($result) == 0)
770 770 {
771   - unlink($indexLockFile);
  771 + //unlink($indexLockFile);
772 772 return;
773 773 }
774 774  
... ... @@ -976,7 +976,7 @@ abstract class Indexer
976 976  
977 977 }
978 978 $default->log->info('indexDocuments: done');
979   - unlink($indexLockFile);
  979 + //unlink($indexLockFile);
980 980 }
981 981  
982 982 public function migrateDocuments($max=null)
... ...
sql/mysql/install/data.sql
View file @9748abe
No preview for this file type