Peter M. Groen / knowledgetree

Commit d22e4be2366c446b59e3312bd641bea599b5c6af

Authored by conradverm
1 parent c86fc384

KTS-673 

"The search algorithm needs some work"
Updated.

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7469 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
search2/indexing/extractorCore.inc.php
  View file @d22e4be
@@ -510,15 +510,17 @@ abstract class CompositeExtractor extends DocumentExtractor @@ -510,15 +510,17 @@ abstract class CompositeExtractor extends DocumentExtractor
510 public function extractTextContent() 510 public function extractTextContent()
511 { 511 {
512 $intermediateFile = $this->targetfile . '.' . $this->targetExtension; 512 $intermediateFile = $this->targetfile . '.' . $this->targetExtension;
  513 + touch($intermediateFile);
513 514
514 $this->sourceExtractor->setSourceFile($this->sourcefile); 515 $this->sourceExtractor->setSourceFile($this->sourcefile);
515 $this->sourceExtractor->setTargetFile($intermediateFile); 516 $this->sourceExtractor->setTargetFile($intermediateFile);
516 $this->sourceExtractor->setMimeType($this->mimetype); 517 $this->sourceExtractor->setMimeType($this->mimetype);
517 $this->sourceExtractor->setExtension($this->extension); 518 $this->sourceExtractor->setExtension($this->extension);
518 - if ($this->sourceExtractor->extractTextContent()) 519 + if (!$this->sourceExtractor->extractTextContent())
519 { 520 {
520 return false; 521 return false;
521 } 522 }
  523 + $intermediateFile = $this->sourceExtractor->getTargetFile();
522 524
523 $this->targetExtractor->setSourceFile($intermediateFile); 525 $this->targetExtractor->setSourceFile($intermediateFile);
524 $this->targetExtractor->setTargetFile($this->targetfile); 526 $this->targetExtractor->setTargetFile($this->targetfile);