From 2d2e5d1f14a5e5bade870fdd921cc954fd6cd19e Mon Sep 17 00:00:00 2001 From: Megan Watson Date: Wed, 21 Jan 2009 07:47:18 +0000 Subject: [PATCH] Added check for registering mime extractors. --- tests/documentProcessor/testExtracters.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/documentProcessor/testExtracters.php b/tests/documentProcessor/testExtracters.php index decfe0c..f64df30 100644 --- a/tests/documentProcessor/testExtracters.php +++ b/tests/documentProcessor/testExtracters.php @@ -100,13 +100,24 @@ class DocumentExtractorsTestCase extends KTUnitTestCase { { static $extractors = array(); - // get powerpoint extractor + // get extractor $query = "select me.id, me.name from mime_types mt INNER JOIN mime_extractors me ON mt.extractor_id = me.id WHERE filetypes = '{$extension}'"; $res = DBUtil::getOneResult($query); + // On first run the mime_extractors table is empty - populate it for the tests + if(empty($res) || PEAR::isError($res)){ + $this->indexer->registerTypes(true); + + $query = "select me.id, me.name from mime_types mt + INNER JOIN mime_extractors me ON mt.extractor_id = me.id + WHERE filetypes = '{$extension}'"; + + $res = DBUtil::getOneResult($query); + } + // Instantiate extractor if(array_key_exists($res['name'], $extractors)){ $extractor = $extractors[$res['name']]; @@ -116,7 +127,7 @@ class DocumentExtractorsTestCase extends KTUnitTestCase { } $this->assertNotNull($extractor); - if(empty($extractor)) return; + if(empty($extractor)) return ''; // Extract content $targetFile = tempnam($this->tempPath, 'ktindexer'); -- libgit2 0.21.4