v/PrintABrick
1
0
Fork 0
mirror of https://github.com/ToxicCrack/PrintABrick.git synced 2025-05-18 05:10:07 -07:00
Code Issues Projects Releases Wiki Activity

Fix loading of keywords

Browse Source
This commit is contained in:
David Hübner 2017-04-27 10:18:32 +02:00
parent b712678a2c
commit fb0a26901d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/AppBundle/Util/LDModelParser.php
View File

@ -58,7 +58,7 @@ class LDModelParser
if (!$firstLine) { if (!$firstLine) {
$array = explode(' ', ltrim(trim($line, 2), '=_~')); $array = explode(' ', ltrim(trim($line, 2), '=_~'));
$model['category'] = isset($array[0]) ? $array[0] : ''; $model['category'] = isset($array[0]) ? $array[0] : '';
$model['name'] = preg_replace('/ {2,}/', ' ', ltrim($line, '=_')); $model['name'] = preg_replace('/ {2,}/', ' ', ltrim($line, '_'));
$firstLine = true; $firstLine = true;
} }
@ -68,7 +68,13 @@ class LDModelParser
} }
// 0 !KEYWORDS <first keyword>, <second keyword>, ..., <last keyword> // 0 !KEYWORDS <first keyword>, <second keyword>, ..., <last keyword>
elseif (strpos($line, '!KEYWORDS ') === 0) { elseif (strpos($line, '!KEYWORDS ') === 0) {
$model['keywords'] = explode(', ', preg_replace('/^!KEYWORDS /', '', $line)); $keywords = explode(',', preg_replace('/^!KEYWORDS /', '', $line));
foreach ($keywords as $keyword) {
$keyword = trim($keyword);
if($keyword) {
$model['keywords'][] = $keyword;
}
}
} }
// 0 Name: <Filename>.dat // 0 Name: <Filename>.dat
elseif (strpos($line, 'Name: ') === 0 && !isset($header['id'])) { elseif (strpos($line, 'Name: ') === 0 && !isset($header['id'])) {
@ -100,7 +106,7 @@ class LDModelParser
$id = strtolower($reference['id']); $id = strtolower($reference['id']);
$color = strtolower($reference['color']); $color = strtolower($reference['color']);
// group subparts by color and id // group subparts by color and id
if (isset($model['subparts'][$id][$color])) { if (isset($model['subparts'][$id][$color])) {
$model['subparts'][$id][$color] = $model['subparts'][$id][$color] + 1; $model['subparts'][$id][$color] = $model['subparts'][$id][$color] + 1;
} else { } else {