Peter M. Groen / knowledgetree

Commit 2d2e5d1f14a5e5bade870fdd921cc954fd6cd19e

Authored by Megan Watson
1 parent 3e5c5bd9

Added check for registering mime extractors. 

Committed by: Megan Watson
Reviewed by: Kevin Fourie



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9735 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 13 additions and 2 deletions
tests/documentProcessor/testExtracters.php
  View file @2d2e5d1
@@ -100,13 +100,24 @@ class DocumentExtractorsTestCase extends KTUnitTestCase { @@ -100,13 +100,24 @@ class DocumentExtractorsTestCase extends KTUnitTestCase {
100 { 100 {
101 static $extractors = array(); 101 static $extractors = array();
102 102
103 - // get powerpoint extractor 103 + // get extractor
104 $query = "select me.id, me.name from mime_types mt 104 $query = "select me.id, me.name from mime_types mt
105 INNER JOIN mime_extractors me ON mt.extractor_id = me.id 105 INNER JOIN mime_extractors me ON mt.extractor_id = me.id
106 WHERE filetypes = '{$extension}'"; 106 WHERE filetypes = '{$extension}'";
107 107
108 $res = DBUtil::getOneResult($query); 108 $res = DBUtil::getOneResult($query);
109 109
  110 + // On first run the mime_extractors table is empty - populate it for the tests
  111 + if(empty($res) || PEAR::isError($res)){
  112 + $this->indexer->registerTypes(true);
  113 +
  114 + $query = "select me.id, me.name from mime_types mt
  115 + INNER JOIN mime_extractors me ON mt.extractor_id = me.id
  116 + WHERE filetypes = '{$extension}'";
  117 +
  118 + $res = DBUtil::getOneResult($query);
  119 + }
  120 +
110 // Instantiate extractor 121 // Instantiate extractor
111 if(array_key_exists($res['name'], $extractors)){ 122 if(array_key_exists($res['name'], $extractors)){
112 $extractor = $extractors[$res['name']]; 123 $extractor = $extractors[$res['name']];
@@ -116,7 +127,7 @@ class DocumentExtractorsTestCase extends KTUnitTestCase { @@ -116,7 +127,7 @@ class DocumentExtractorsTestCase extends KTUnitTestCase {
116 } 127 }
117 128
118 $this->assertNotNull($extractor); 129 $this->assertNotNull($extractor);
119 - if(empty($extractor)) return; 130 + if(empty($extractor)) return '';
120 131
121 // Extract content 132 // Extract content
122 $targetFile = tempnam($this->tempPath, 'ktindexer'); 133 $targetFile = tempnam($this->tempPath, 'ktindexer');