gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 07:04:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2016-04-07 08:38:05 +02:00
commit c86616b971
5 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -31,6 +31,7 @@
- take out last empty line from view/bootstrap/class.Search.php which causes a
header to be send to early (Closes: #252, #254)
- regular users with sufficient access rights may remove documents via webdav
- fix error in utils/indexer.php when new documents were indexed
--------------------------------------------------------------------------------
Changes in version 4.3.25

4
SeedDMS_Preview/Preview/Previewer.php
View File

@ -93,7 +93,9 @@ class SeedDMS_Preview_Previewer {
do {
$timeleft = $timeout - time();
$read = array($pipes[1]);
stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
$write = NULL;
$exeptions = NULL;
stream_select($read, $write, $exeptions, $timeleft, 200000);
if (!empty($read)) {
$output .= fread($pipes[1], 8192);

28
SeedDMS_Preview/package.xml
View File

@ -11,11 +11,11 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2016-03-29</date>
<time>08:07:14</time>
<date>2016-04-05</date>
<time>15:17:11</time>
<version>
<release>1.1.7</release>
<api>1.1.7</api>
<release>1.1.8</release>
<api>1.1.8</api>
</version>
<stability>
<release>stable</release>
@ -23,12 +23,16 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
<<<<<<< HEAD
- Converters to create preview images are no longer fixed. Those which has been hardcoded before remain the predefined converters, but they can also be changed.
- command for creating the preview will be called with a given timeout
add method getFilesize()
timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
check if object passed to createPreview(), hasPreview() is not null
set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
=======
pass variables to stream_select (required by php7)
>>>>>>> seeddms-5.0.x
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -185,5 +189,21 @@ timeout for external commands can be passed to contructor of SeedDMS_Preview_Pre
check if object passed to createPreview(), hasPreview() is not null
</notes>
</release>
<release>
<date>2016-03-29</date>
<time>08:07:14</time>
<version>
<release>1.1.7</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>
set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
</notes>
</release>
</changelog>
</package>

2
inc/inc.Settings.php
View File

@ -2,7 +2,7 @@
// MyDMS. Document Management System
// Copyright (C) 2002-2005 Markus Westphal
// Copyright (C) 2006-2008 Malcolm Cowe
// Copyright (C) 2010 Matteo Lucarelli
// Copyright (C) 2010 Matteo Lucarelli
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by

13
utils/indexer.php
View File

@ -98,13 +98,12 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
if($created >= $content->getDate()) {
echo " (Document unchanged)\n";
} else {
if($index->delete($hit->id)) {
try {
$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
echo " (Document updated)\n";
} catch(Exception $e) {
echo " (Timeout)\n";
}
$index->delete($hit->id);
try {
$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
echo " (Document updated)\n";
} catch(Exception $e) {
echo " (Timeout)\n";
}
}
}