pts-core: Add pts_installed_test_tandem_XmlReader object

4 files changed, 45 insertions, 6 deletions

diff --git a/pts-core/functions/pts-functions_tests.php b/pts-core/functions/pts-functions_tests.php
index 6070120..2b61ce0 100644
--- a/pts-core/functions/pts-functions_tests.php
+++ b/pts-core/functions/pts-functions_tests.php
@@ -255,7 +255,7 @@ function pts_test_installed_checksum_installer($identifier)
 
 	if(pts_test_installed($identifier))
 	{
-	 	$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $identifier . "/pts-install.xml", false);
+	 	$xml_parser = new pts_installed_test_tandem_XmlReader($identifier, false);
 		$version = $xml_parser->getXMLValue(P_INSTALL_TEST_CHECKSUM);
 	}
 
@@ -281,7 +281,7 @@ function pts_test_installed_system_identifier($identifier)
 
 	if(pts_test_installed($identifier))
 	{
-	 	$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $identifier . "/pts-install.xml", false);
+	 	$xml_parser = new pts_installed_test_tandem_XmlReader($identifier, false);
 		$value = $xml_parser->getXMLValue(P_INSTALL_TEST_SYSIDENTIFY);
 	}
 
@@ -311,7 +311,7 @@ function pts_test_installed_profile_version($identifier)
 
 	if(pts_test_installed($identifier))
 	{
-	 	$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $identifier . "/pts-install.xml", false);
+	 	$xml_parser = new pts_installed_test_tandem_XmlReader($identifier, false);
 		$version = $xml_parser->getXMLValue(P_INSTALL_TEST_VERSION);
 	}
 
@@ -325,7 +325,7 @@ function pts_test_generate_install_xml($identifier)
 function pts_test_refresh_install_xml($identifier, $this_test_duration = 0, $new_install = false)
 {
 	// Generate/refresh an install XML for pts-install.xml
- 	$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $identifier . "/pts-install.xml", false);
+ 	$xml_parser = new pts_installed_test_tandem_XmlReader($identifier, false);
 	$xml_writer = new tandem_XmlWriter();
 
 	$test_duration = $xml_parser->getXMLValue(P_INSTALL_TEST_AVG_RUNTIME);
diff --git a/pts-core/objects/pts_test_profile_details.php b/pts-core/objects/pts_test_profile_details.php
index 2c02ac3..ae57707 100644
--- a/pts-core/objects/pts_test_profile_details.php
+++ b/pts-core/objects/pts_test_profile_details.php
@@ -107,7 +107,7 @@ class pts_test_profile_details
 
 		if(pts_test_installed($this->identifier))
 		{
-			$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $this->identifier . "/pts-install.xml", false);
+			$xml_parser = new pts_installed_test_tandem_XmlReader($this->identifier, false);
 			$last_run = $xml_parser->getXMLValue(P_INSTALL_TEST_LASTRUNTIME);
 			$avg_time = $xml_parser->getXMLValue(P_INSTALL_TEST_AVG_RUNTIME);
 
diff --git a/pts-core/objects/pts_test_usage_details.php b/pts-core/objects/pts_test_usage_details.php
index 4a1aeab..384d213 100644
--- a/pts-core/objects/pts_test_usage_details.php
+++ b/pts-core/objects/pts_test_usage_details.php
@@ -31,7 +31,7 @@ class pts_test_usage_details
 
 	public function __construct($identifier)
 	{
-		$xml_parser = new tandem_XmlReader(TEST_ENV_DIR . $identifier . "/pts-install.xml");
+		$xml_parser = new pts_installed_test_tandem_XmlReader($identifier);
 		$this->identifier = $identifier;
 		$this->install_time = substr($xml_parser->getXMLValue(P_INSTALL_TEST_INSTALLTIME), 0, 10);
 		$this->last_run_time = substr($xml_parser->getXMLValue(P_INSTALL_TEST_LASTRUNTIME), 0, 10);
diff --git a/pts-core/objects/tandem_Xml/pts_installed_test_tandem_XmlReader.php b/pts-core/objects/tandem_Xml/pts_installed_test_tandem_XmlReader.php
new file mode 100644
index 0000000..1903fac
--- /dev/null
+++ b/pts-core/objects/tandem_Xml/pts_installed_test_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_installed_test_tandem_XmlReader.php: The XML reading object for the Phoronix Test Suite with optimizations for handling installed tests
+
+	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_installed_test_tandem_XmlReader extends tandem_XmlReader
+{
+	public function __construct($read_xml, $cache_support = true)
+	{
+		if(!is_file($read_xml) || substr($read_xml, -3) != "xml")
+		{
+			$read_xml = TEST_ENV_DIR . $read_xml . "/pts-install.xml";
+		}
+
+		parent::__construct($read_xml, $cache_support);
+	}
+}
+?>