fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-1777

Browse Source 
Al realizar un export de un proceso (Normal/Granular) se hace un truncate del nombre sin embargo no se considera nombres de file Multibyte solo se toma en cuenta nombres de tipo Monobyte
This commit is contained in:
dheeyi william
2016-09-05 14:25:28 -04:00
parent c1b9d18a3d
commit 0efc5474ab
2 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXPublisher.php
View File

@@ -46,8 +46,7 @@ class PMXPublisher
$lastPos = strrpos($filename, '.'); $lastPos = strrpos($filename, '.');
$fileName = substr($filename, 0, $lastPos); $fileName = substr($filename, 0, $lastPos);
$newFileName = \G::inflect($fileName); $newFileName = \G::inflect($fileName);
$excess = strlen($newFileName) - $limit; $newFileName = $this->truncateFilename($newFileName, $limit);
$newFileName = substr($newFileName, 0, strlen($newFileName) - $excess - 1);
$newOutputFile = str_replace($fileName, $newFileName, $outputFile); $newOutputFile = str_replace($fileName, $newFileName, $outputFile);
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$newOutputFile = str_replace("/", DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, $newOutputFile); $newOutputFile = str_replace("/", DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, $newOutputFile);
@@ -57,9 +56,31 @@ class PMXPublisher
setlocale(LC_CTYPE, $currentLocale); setlocale(LC_CTYPE, $currentLocale);
} else { } else {
$outputFile = \G::inflect($outputFile); $outputFile = \G::inflect($outputFile);
if (strlen($outputFile) >= $limit) { $outputFile = $this->truncateFilename($outputFile, $limit);
$excess = strlen($outputFile) - $limit; }
$newFileName = substr($outputFile, 0, strlen($outputFile) - $excess - 1); return $outputFile;
}
/**
* @param $outputFile
* @param $limit
* @return string
*/
private function truncateFilename($outputFile, $limit)
{
$limitFile = $limit;
if (mb_strlen($outputFile) != strlen($outputFile)) {
if (strlen($outputFile) >= $limitFile) {
do {
$newFileName = mb_strimwidth($outputFile, 0, $limit);
--$limit;
} while (strlen($newFileName) > $limitFile);
$outputFile = $newFileName;
}
} else {
if (strlen($outputFile) >= $limitFile) {
$excess = strlen($outputFile) - $limitFile;
$newFileName = substr($outputFile, 0, strlen($outputFile) - $excess);
$outputFile = $newFileName; $outputFile = $newFileName;
} }
} }

31
workflow/engine/src/ProcessMaker/Exporter/XmlExporter.php
View File

@@ -181,8 +181,7 @@ class XmlExporter extends Exporter
$lastPos = strrpos($filename, '.'); $lastPos = strrpos($filename, '.');
$fileName = substr($filename, 0, $lastPos); $fileName = substr($filename, 0, $lastPos);
$newFileName = \G::inflect($fileName); $newFileName = \G::inflect($fileName);
$excess = strlen($newFileName) - $limit; $newFileName = $this->truncateFilename($newFileName, $limit);
$newFileName = substr($newFileName, 0, strlen($newFileName) - $excess - 1);
$newOutputFile = str_replace($fileName, $newFileName, $outputFile); $newOutputFile = str_replace($fileName, $newFileName, $outputFile);
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$newOutputFile = str_replace("/", DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, $newOutputFile); $newOutputFile = str_replace("/", DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, $newOutputFile);
@@ -192,9 +191,31 @@ class XmlExporter extends Exporter
setlocale(LC_CTYPE, $currentLocale); setlocale(LC_CTYPE, $currentLocale);
} else { } else {
$outputFile = \G::inflect($outputFile); $outputFile = \G::inflect($outputFile);
if (strlen($outputFile) >= $limit) { $outputFile = $this->truncateFilename($outputFile, $limit);
$excess = strlen($outputFile) - $limit; }
$newFileName = substr($outputFile, 0, strlen($outputFile) - $excess - 1); return $outputFile;
}
/**
* @param $outputFile
* @param $limit
* @return string
*/
private function truncateFilename($outputFile, $limit)
{
$limitFile = $limit;
if (mb_strlen($outputFile) != strlen($outputFile)) {
if (strlen($outputFile) >= $limitFile) {
do {
$newFileName = mb_strimwidth($outputFile, 0, $limit);
--$limit;
} while (strlen($newFileName) > $limitFile);
$outputFile = $newFileName;
}
} else {
if (strlen($outputFile) >= $limitFile) {
$excess = strlen($outputFile) - $limitFile;
$newFileName = substr($outputFile, 0, strlen($outputFile) - $excess);
$outputFile = $newFileName; $outputFile = $newFileName;
} }
} }