diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-04-23 13:39:56 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-04-23 13:39:56 -0400 |
| commit | fdc28a7186f6b42eb3b7f7a7bcdca501691608bc (patch) | |
| tree | 6d2c17e3bc201861b284af2558614ab8c70e673e /pts-core/functions/pts-functions-merge.php | |
| parent | 2e2bc10daa8aa0ad3679aa7fec9911a20973d293 (diff) | |
| download | phoronix-test-suite-upstream-fdc28a7186f6b42eb3b7f7a7bcdca501691608bc.tar.gz phoronix-test-suite-upstream-fdc28a7186f6b42eb3b7f7a7bcdca501691608bc.tar.xz phoronix-test-suite-upstream-fdc28a7186f6b42eb3b7f7a7bcdca501691608bc.zip | |
Major Commit... Rework saved results file hierarchy. Each saved set now
has its own folder inside the saved results location. The "main" file
now for each save is composite.xml.
Diffstat (limited to 'pts-core/functions/pts-functions-merge.php')
| -rw-r--r-- | pts-core/functions/pts-functions-merge.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pts-core/functions/pts-functions-merge.php b/pts-core/functions/pts-functions-merge.php index 40acb15..f93353d 100644 --- a/pts-core/functions/pts-functions-merge.php +++ b/pts-core/functions/pts-functions-merge.php @@ -6,8 +6,8 @@ function pts_find_file($file) { if(is_file($file)) $USE_FILE = $file; - else if(is_file(SAVE_RESULTS_LOCATION . "$file.xml")) - $USE_FILE = SAVE_RESULTS_LOCATION . "$file.xml"; + else if(is_file(SAVE_RESULTS_LOCATION . $file . "/composite.xml")) + $USE_FILE = SAVE_RESULTS_LOCATION . $file . "/composite.xml"; else if(trim(file_get_contents("http://www.phoronix-test-suite.com/global/profile-check.php?id=$file")) == "REMOTE_FILE") $USE_FILE = "http://www.phoronix-test-suite.com/global/pts-results-viewer.php?id=$file"; else @@ -104,7 +104,7 @@ function pts_merge_benchmarks($OLD_RESULTS, $NEW_RESULTS) $RESULTS = new tandem_XmlWriter(); - $RESULTS->setXslBinding("pts-results-viewer/viewer.xsl"); + $RESULTS->setXslBinding("pts-results-viewer.xsl"); $RESULTS->addXmlObject("PhoronixTestSuite/Suite/Title", 0, $new_suite_title); $RESULTS->addXmlObject("PhoronixTestSuite/Suite/Name", 0, $new_suite_name); |