Merged in from DEV trunk...

KTS-3350 "When installing stack as root, OpenOffice stores files as root in the KT temp folder. The indexing scripts cannot clean these up." Fixed. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8450 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-3350 "When installing stack as root, OpenOffice stores files as root in the KT temp folder. The indexing scripts cannot clean these up." Fixed. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8450 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 99e1d42f
Showing 6 changed files with 98 additions and 4 deletions
search2/bin/cronCleanup.php
search2/indexing/extractorCore.inc.php
search2/indexing/extractors/OOTextExtractor.inc.php
search2/indexing/extractors/PDFExtractor.inc.php
sql/mysql/install/data.sql
sql/mysql/upgrade/3.5.2/temp_cleanup.sql
+<?php
+
+/**
+ * $Id:$
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008 KnowledgeTree Inc.
+ * Portions copyright The Jam Warehouse Software (Pty) Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ *
+ */
+
+chdir(dirname(__FILE__));
+require_once(realpath('../../config/dmsDefaults.php'));
+
+$config = KTConfig::getSingleton();
+$temp_dir =$config->get("urls/tmpDirectory");
+
+
+cleanupTempDirectory($temp_dir);
+
+function cleanupTempDirectory($dir)
+{
+    if (!is_dir($dir))
+    {
+        return;
+    }
+    $dir = str_replace('\\','/', $dir);
+
+    $dh = opendir($dir);
+    while (($name = readdir($dh)) !== false)
+    {
+        if (substr($name, 0, 9) != 'ktindexer')
+        {
+            continue;
+        }
+        unlink($dir . '/' . $name);
+    }
+    closedir($dh);
+}
+
+
+
+?>
 \ No newline at end of file
@@ -654,6 +654,7 @@ abstract class CompositeExtractor extends DocumentExtractor
 		}
 		@unlink($intermediateFile);
+		$this->setTargetFile($this->targetExtractor->getTargetFile());
 		return $result;
 	}
@@ -132,6 +132,9 @@ class OOTextExtractor extends ExternalDocumentExtractor
 			return true;
 		}
 		$content = file_get_contents($this->targetfile);
+
+        $this->setTargetFile($this->targetfile . '.txt');
+
 		return file_put_contents($this->targetfile, $this->filter($content));
 	}
@@ -73,6 +73,18 @@ class PDFExtractor extends ApplicationExtractor
 			return true;
 		}
+		if (false === $res && (strpos($this->output, 'font') !== false))
+		{
+			$this->output = '';
+			return true;
+		}
+
+		if (filesize($this->targetfile) > 0)
+		{
+			$this->output = '';
+			return true;
+		}
+
 		return $res;
 	}
@@ -809,7 +809,9 @@ INSERT INTO `scheduler_tasks` VALUES
 (3,'Index Optimisation','search2/bin/optimise.php','',0,'weekly','2007-10-01',NULL,0,'system'),
 (4,'Periodic Document Expunge','bin/expungeall.php','',0,'weekly','2007-10-01',NULL,0,'disabled'),
 (5,'Database Maintenance','bin/dbmaint.php','optimize',0,'monthly','2007-10-01',NULL,0,'disabled'),
-(6,'Open Office test','bin/checkopenoffice.php','',0,'1min','2007-10-01',NULL,0,'enabled');
+(6,'Open Office test','bin/checkopenoffice.php','',0,'1min','2007-10-01',NULL,0,'enabled'),
+(7,'Cleanup Temporary Directory','search2/bin/cronCleanup.php','',0,'1min','2007-10-01',NULL,0,'enabled');
+
 /*!40000 ALTER TABLE `scheduler_tasks` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -984,7 +986,8 @@ INSERT INTO `upgrades` VALUES (1,&#39;sql*2.0.6*0*2.0.6/create_upgrade_table.sql&#39;,&#39;D
 (176,'sql*3.5.2*0*3.5.2/clean_plugin_helper.sql','Clean out the plugin helper table.','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
 (177,'sql*3.5.2*0*3.5.2/openxml_mime_types.sql','Add the OpenXML mimetypes.','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
 (178,'sql*3.5.2*0*3.5.2/rss_plugin_title.sql','Increase size of RSS Title.','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
-(179,'upgrade*3.5.2*99*upgrade3.5.2','Upgrade from version 3.5.1 to 3.5.2','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2');
+(179,'sql*3.5.2*0*3.5.2/temp_cleanup.sql','Adds background script to clean up temporary index files.','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2'),
+(180,'upgrade*3.5.2*99*upgrade3.5.2','Upgrade from version 3.5.1 to 3.5.2','2007-11-21 00:00:00',1,'upgrade*3.5.2*99*upgrade3.5.2');
 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1722,7 +1725,7 @@ UNLOCK TABLES;
 LOCK TABLES `zseq_scheduler_tasks` WRITE;
 /*!40000 ALTER TABLE `zseq_scheduler_tasks` DISABLE KEYS */;
-INSERT INTO `zseq_scheduler_tasks` VALUES (6);
+INSERT INTO `zseq_scheduler_tasks` VALUES (7);
 /*!40000 ALTER TABLE `zseq_scheduler_tasks` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1811,7 +1814,7 @@ UNLOCK TABLES;
 LOCK TABLES `zseq_upgrades` WRITE;
 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
-INSERT INTO `zseq_upgrades` VALUES (179);
+INSERT INTO `zseq_upgrades` VALUES (180);
 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
+select @id:=ifnull(max(id),0)+1 from scheduler_tasks;
+INSERT INTO `scheduler_tasks` VALUES (@id,'Cleanup Temporary Directory','search2/bin/cronCleanup.php','',0,'1min','2007-10-01',NULL,0,'enabled');
+
+UPDATE zseq_scheduler_tasks set id=@id;
 \ No newline at end of file