From 77eab44dc10b3ad8d8b3d1d5ba647ba96c558b63 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Mar 2017 15:56:00 +0100
Subject: [PATCH] new version, catch exception in execWithTimeout()

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php | 17 ++++----------
 SeedDMS_Lucene/package.xml                | 28 ++++++++++++++++++-----
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 874bfd149..027536dae 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -127,19 +127,12 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			$mimetype = $version->getMimeType();
 			if(isset($_convcmd[$mimetype])) {
 				$cmd = sprintf($_convcmd[$mimetype], $path);
-				$content = self::execWithTimeout($cmd, $timeout);
-				/*
-				$fp = popen($cmd, 'r');
-				if($fp) {
-					$content = '';
-					while(!feof($fp)) {
-						$content .= fread($fp, 2048);
+				try {
+					$content = self::execWithTimeout($cmd, $timeout);
+					if($content) {
+						$this->addField(Zend_Search_Lucene_Field::UnStored('content', $content, 'utf-8'));
 					}
-					pclose($fp);
-				}
-				 */
-				if($content) {
-					$this->addField(Zend_Search_Lucene_Field::UnStored('content', $content, 'utf-8'));
+				} catch (Exception $e) {
 				}
 			}
 		}
diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 3f5e3d45c..774715d7b 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-28</date>
- <time>08:11:19</time>
+ <date>2017-03-01</date>
+ <time>15:55:32</time>
  <version>
-  <release>1.1.9</release>
-  <api>1.1.7</api>
+  <release>1.1.10</release>
+  <api>1.1.10</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,8 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-pass variables to stream_select() to fullfill strict standards.
-make all functions in Indexer.php static
+catch exception in execWithTimeout()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -235,5 +234,22 @@ add command for indexing postѕcript files
 set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
    </notes>
   </release>
+  <release>
+   <date>2016-04-28</date>
+   <time>08:11:19</time>
+   <version>
+    <release>1.1.9</release>
+    <api>1.1.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+pass variables to stream_select() to fullfill strict standards.
+make all functions in Indexer.php static
+   </notes>
+  </release>
  </changelog>
 </package>