From 8d65583ab7bee1fd9fbbad350bb8f11e25740ca2 Mon Sep 17 00:00:00 2001 From: hodasemi Date: Mon, 12 Nov 2018 20:53:11 +0100 Subject: [PATCH] Read files correctly --- aufgabe2/resources/world_data_sheet.xslt | 2 +- aufgabe2/world_data_parser.php | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/aufgabe2/resources/world_data_sheet.xslt b/aufgabe2/resources/world_data_sheet.xslt index 36d47ea..7c61f2c 100644 --- a/aufgabe2/resources/world_data_sheet.xslt +++ b/aufgabe2/resources/world_data_sheet.xslt @@ -4,7 +4,7 @@

World Data Overview ...

- +
diff --git a/aufgabe2/world_data_parser.php b/aufgabe2/world_data_parser.php index ad84bc0..14d3f07 100644 --- a/aufgabe2/world_data_parser.php +++ b/aufgabe2/world_data_parser.php @@ -55,16 +55,23 @@ class WorldDataParser { return file_exists($file); } + function read_file($path) { + $fh = fopen($path, "rb"); + $data = fread($fh, filesize($path)); + fclose($fh); + + return $data; + } + function printXML($xml_file, $xslt_sheet) { $xsl_doc = new DOMDocument(); - $xsl_res = $xsl_doc->loadXML($xslt_sheet); - if ($xsl_res === false) { - echo "reading xsl sheet failed: {$xsl_res}"; + if ($xsl_doc->loadXML($this->read_file($xslt_sheet)) === false) { + echo "reading xsl sheet failed"; return; } $xml_doc = new DOMDocument(); - if ($xml_doc->loadXML($xml_file) === false) { + if ($xml_doc->loadXML($this->read_file($xml_file)) === false) { echo "reading world data xml failed"; return; }
id name