museum-digital/csvxml
museum-digital/csvxml
33
0
Fork 0
Code Issues 3 Pull Requests Releases Activity

Fix incorrect xml file path in ZIP creation

Browse Source 
phpcs-errors:0 phpunit-status:successful phpstan-errors:1
This commit is contained in:
Joshua Ramon Enslin 2020-11-08 14:44:06 +01:00 committed by Stefan Rohde-Enslin
parent a8cb46848b
commit 65e09278dc
Signed by: jrenslin
GPG Key ID: 46016F84501B70AE
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/index3.php
View File

@ -19,6 +19,7 @@ else if (!isset($_SESSION['lang'])) {
$_SESSION['lang'] = MD_STD::lang_getfrombrowser($allowed_langs, 'en', "", false); $_SESSION['lang'] = MD_STD::lang_getfrombrowser($allowed_langs, 'en', "", false);
} }
$lang = $_SESSION['lang']; $lang = $_SESSION['lang'];
$tlLoader = new MDTlLoader("csxml_evaluate", $lang);
$filename = $_GET['fnam']; $filename = $_GET['fnam'];
$csv_datei = MD_STD::realpath(__DIR__ . '/../csv/' . $filename); $csv_datei = MD_STD::realpath(__DIR__ . '/../csv/' . $filename);
@ -34,7 +35,7 @@ foreach ($availableFields as $categoryName => $fieldCategory) {
$allowed = array_merge($allowed, array_keys($fieldCategory)); $allowed = array_merge($allowed, array_keys($fieldCategory));
// Extended operations for events // Extended operations for events
if (strpos($categoryName, $basis['event']) !== false) { if (strpos($categoryName, $tlLoader->tl("basis", "basis", 'event')) !== false) {
foreach ($fieldCategory as $key => $value) { foreach ($fieldCategory as $key => $value) {
if (strpos($key, "_annotation") !== false or strpos($key, "_gnd") !== false) continue; if (strpos($key, "_annotation") !== false or strpos($key, "_gnd") !== false) continue;
if (strpos($key, "_sure") !== false) $eventpartsure[] = $key; if (strpos($key, "_sure") !== false) $eventpartsure[] = $key;
@ -339,7 +340,7 @@ if ($hasanyimage > 0) {
//check if in a row any image_name is given //check if in a row any image_name is given
$maimg = $hatimg = 0; $maimg = $hatimg = 0;
foreach ($imagemain as $im => $tMainImage) { foreach ($imagemain as $im => $tMainImage) {
if ($inhalt[$i][$tMainImage] != '') $hatimg++; if ($inhalt[$i][$tMainImage["name"]] != '') $hatimg++;
} }
if ($hatimg > 0) { if ($hatimg > 0) {
// first check: how many main-images? // first check: how many main-images?

2
public/index6.php
View File

@ -39,7 +39,7 @@ while ($zeile = fgetcsv($fp, 100000, ';')) {
$y++; $y++;
$zieldatei = 'xml/' . $y . '.xml'; $zieldatei = __DIR__ . '/../xml/' . $y . '.xml';
if (!$handle = fopen($zieldatei, 'w')) { if (!$handle = fopen($zieldatei, 'w')) {
echo "Cannot open file ($zieldatei)";exit; echo "Cannot open file ($zieldatei)";exit;
} }