pts-core: Add pts_results_tandem_XmlReader() object for providing file

handling in the constructor

4 files changed, 45 insertions, 6 deletions

diff --git a/pts-core/functions/pts-functions-run.php b/pts-core/functions/pts-functions-run.php
index 8bb7a4d..cdb79f9 100644
--- a/pts-core/functions/pts-functions-run.php
+++ b/pts-core/functions/pts-functions-run.php
@@ -422,7 +422,7 @@ function pts_validate_save_file_name($proposed_save_name, $to_run)
 
 	if(is_file(SAVE_RESULTS_DIR . $proposed_save_name . "/composite.xml") && !pts_is_assignment("AUTO_SAVE_NAME"))
 	{
-		$xml_parser = new tandem_XmlReader(SAVE_RESULTS_DIR . $proposed_save_name . "/composite.xml");
+		$xml_parser = new pts_results_tandem_XmlReader($proposed_save_name);
 		$test_suite = $xml_parser->getXMLValue(P_RESULTS_SUITE_NAME);
 
 		if(!pts_is_assignment("GLOBAL_COMPARISON"))
diff --git a/pts-core/functions/pts-functions_types.php b/pts-core/functions/pts-functions_types.php
index 2822c89..53d17dc 100644
--- a/pts-core/functions/pts-functions_types.php
+++ b/pts-core/functions/pts-functions_types.php
@@ -294,7 +294,7 @@ function pts_contained_tests($object, $include_extensions = false)
 
 	if(pts_is_suite($object)) // Object is suite
 	{
-		$xml_parser = new tandem_XmlReader(@file_get_contents(pts_location_suite($object)));
+		$xml_parser = new pts_suite_tandem_XmlReader($object);
 		$tests_in_suite = array_unique($xml_parser->getXMLArrayValues(P_SUITE_TEST_NAME));
 
 		foreach($tests_in_suite as $test)
@@ -334,7 +334,7 @@ function pts_contained_tests($object, $include_extensions = false)
 	}
 	else if(is_file(SAVE_RESULTS_DIR . $object . "/composite.xml")) // Object is a saved results file
 	{
-		$xml_parser = new tandem_XmlReader(SAVE_RESULTS_DIR . $object . "/composite.xml");
+		$xml_parser = new pts_suite_tandem_XmlReader($object);
 		$tests_in_save = $xml_parser->getXMLArrayValues(P_RESULTS_TEST_TESTNAME);
 
 		foreach($tests_in_save as $test)
diff --git a/pts-core/objects/tandem_Xml/pts_results_tandem_XmlReader.php b/pts-core/objects/tandem_Xml/pts_results_tandem_XmlReader.php
new file mode 100644
index 0000000..35864f0
--- /dev/null
+++ b/pts-core/objects/tandem_Xml/pts_results_tandem_XmlReader.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+	Phoronix Test Suite
+	URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+	Copyright (C) 2008, Phoronix Media
+	Copyright (C) 2004-2008, Michael Larabel
+	pts_results_tandem_XmlReader.php: The XML reading object for the Phoronix Test Suite for test results
+
+	Additional Notes: A very simple XML parser with a few extras... Does not currently support attributes on tags, etc.
+	A work in progress. This was originally designed for just some select needs in the past. No XML validation is done with this parser, etc.
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class pts_results_tandem_XmlReader extends tandem_XmlReader
+{
+	public function __construct($read_xml, $cache_support = true)
+	{
+		if(!is_file($read_xml) && is_file(SAVE_RESULTS_DIR . $read_xml . "/composite.xml"))
+		{
+			$read_xml = pts_location_suite(SAVE_RESULTS_DIR . $read_xml . "/composite.xml");
+		}
+
+		parent::__construct($read_xml, $cache_support);
+	}
+}
+?>
diff --git a/pts-core/options/run_test.php b/pts-core/options/run_test.php
index 21e8fdc..c0cdae2 100644
--- a/pts-core/options/run_test.php
+++ b/pts-core/options/run_test.php
@@ -202,7 +202,7 @@ class run_test implements pts_option_interface
 			{
 				echo pts_string_header("Test Suite: " . $to_run);
 
-				$xml_parser = new tandem_XmlReader(pts_location_suite($to_run));
+				$xml_parser = new pts_suite_tandem_XmlReader($to_run);
 
 				if($unique_test_names == 1)
 				{
@@ -272,7 +272,7 @@ class run_test implements pts_option_interface
 			{
 				echo pts_string_header("Comparison: " . $to_run);
 
-				$xml_parser = new tandem_XmlReader(SAVE_RESULTS_DIR . $to_run . "/composite.xml");
+				$xml_parser = new pts_results_tandem_XmlReader($to_run);
 				$custom_title = $xml_parser->getXMLValue(P_RESULTS_SUITE_TITLE);
 				$test_description = $xml_parser->getXMLValue(P_RESULTS_SUITE_DESCRIPTION);
 				$test_extensions = $xml_parser->getXMLValue(P_RESULTS_SUITE_EXTENSIONS);
@@ -361,7 +361,7 @@ class run_test implements pts_option_interface
 				// Prompt Identifiers
 				if(is_file(SAVE_RESULTS_DIR . $PROPOSED_FILE_NAME . "/composite.xml"))
 				{
-					$xml_parser = new tandem_XmlReader(SAVE_RESULTS_DIR . $PROPOSED_FILE_NAME . "/composite.xml");
+					$xml_parser = new pts_results_tandem_XmlReader($PROPOSED_FILE_NAME);
 					$raw_results = $xml_parser->getXMLArrayValues(P_RESULTS_RESULTS_GROUP);
 					$result_identifiers = array();