holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce memory usage during merge a bit

Browse Source
This commit is contained in:
Nathan Gray 2016-02-02 04:47:16 +00:00
parent e271a56753
commit f9bcb91d33
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
etemplate/inc/class.bo_merge.inc.php
View File

@ -759,6 +759,36 @@ abstract class bo_merge
return false; return false;
} }
if ($this->report_memory_usage) error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat)); if ($this->report_memory_usage) error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
if ($contentrepeat)
{
$content_stream = fopen('php://temp','r+');
fwrite($content_stream, $contentstart);
$joiner = '';
switch($mimetype)
{
case 'application/rtf':
case 'text/rtf':
$joiner = '\\par \\page\\pard\\plain';
break;
case 'application/vnd.oasis.opendocument.text':
case 'application/vnd.oasis.opendocument.spreadsheet':
case 'application/xml':
case 'text/html':
$joiner = '';
break;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
$joiner = '<w:br w:type="page" />';
break;
case 'text/plain':
$joiner = "\r\n";
break;
default:
$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
return false;
}
}
foreach ((array)$ids as $n => $id) foreach ((array)$ids as $n => $id)
{ {
if ($contentrepeat) $content = $contentrepeat; //content to repeat if ($contentrepeat) $content = $contentrepeat; //content to repeat
@ -820,7 +850,7 @@ abstract class bo_merge
{ {
$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content); $content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content);
} }
if ($contentrepeat) $contentrep[is_array($id) ? implode(':',$id) : $id] = $content; if ($contentrepeat) fwrite($content_stream, ($n == 0 ? '' : $joiner) . $content);
} }
if ($Labelrepeat) if ($Labelrepeat)
{ {
@ -861,24 +891,9 @@ abstract class bo_merge
if ($contentrepeat) if ($contentrepeat)
{ {
switch($mimetype) fwrite($content_stream, $contentend);
{ rewind($content_stream);
case 'application/rtf': return stream_get_contents($content_stream);
case 'text/rtf':
return $contentstart.implode('\\par \\page\\pard\\plain',$contentrep).$contentend;
case 'application/vnd.oasis.opendocument.text':
case 'application/vnd.oasis.opendocument.spreadsheet':
case 'application/xml':
case 'text/html':
return $contentstart.implode('',$contentrep).$contentend;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
return $contentstart.implode('<w:br w:type="page" />',$contentrep).$contentend;
case 'text/plain':
return $contentstart.implode("\r\n",$contentrep).$contentend;
}
$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
return false;
} }
if ($this->report_memory_usage) error_log(__METHOD__."() returning ".egw_vfs::hsize(memory_get_peak_usage(true))); if ($this->report_memory_usage) error_log(__METHOD__."() returning ".egw_vfs::hsize(memory_get_peak_usage(true)));