From 65e80365fabe96553d8771eae18225d6f2066008 Mon Sep 17 00:00:00 2001
From: conradverm <conradverm@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Mon, 22 Oct 2007 21:48:21 +0000
Subject: [PATCH] KTS-673 "The search algorithm needs some work" Updated.

---
 search2/indexing/extractors/OOPresentationExtractor.inc.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/search2/indexing/extractors/OOPresentationExtractor.inc.php b/search2/indexing/extractors/OOPresentationExtractor.inc.php
index e832cc9..c6c6c22 100755
--- a/search2/indexing/extractors/OOPresentationExtractor.inc.php
+++ b/search2/indexing/extractors/OOPresentationExtractor.inc.php
@@ -1,9 +1,17 @@
 <?php
 
-require_once('OOPDFTextExtractor.inc.php');
+require_once('OOTextExtractor.inc.php');
+require_once('PDFExtractor.inc.php');
 
-class OOPresentationExtractor extends OOPDFTextExtractor
+class OOPresentationExtractor extends CompositeExtractor
 {
+	public function __construct()
+	{
+		$sourceExtractor = new OOPresentationToPDF();
+		$targetExtractor = new PDFExtractor();
+		parent::__construct($sourceExtractor, 'pdf', 'application/pdf', $targetExtractor, true);
+	}
+
 	public function getDisplayName()
 	{
 		return _kt('OpenOffice Presentation Extractor');
@@ -18,4 +26,18 @@ class OOPresentationExtractor extends OOPDFTextExtractor
 	}
 }
 
+class OOPresentationToPDF extends OOTextExtractor
+{
+	public function __construct()
+	{
+		parent::__construct('pdf');
+		$this->documentConverter = KT_DIR . '/bin/openoffice/pdfgen.py';
+		if (!is_file($this->documentConverter))
+		{
+			$this->documentConverter = false;
+		}
+	}
+}
+
+
 ?>
\ No newline at end of file
--
libgit2 0.21.4