diff options
| author | Michael Larabel <Michael AT phoronix.com> | 2008-05-15 15:50:30 -0400 |
|---|---|---|
| committer | Michael Larabel <Michael AT phoronix.com> | 2008-05-15 15:50:30 -0400 |
| commit | 764a2c2953023f79dda1d281e5bad6c55d9881c6 (patch) | |
| tree | 38d01a56ed1c4434d2406cdc8bce98105d456fca /pts-core/functions/pts-functions_config.php | |
| parent | e563321de3ff2386156b03b16bf6ffad45f7c6e7 (diff) | |
| download | phoronix-test-suite-upstream-764a2c2953023f79dda1d281e5bad6c55d9881c6.tar.gz phoronix-test-suite-upstream-764a2c2953023f79dda1d281e5bad6c55d9881c6.tar.xz phoronix-test-suite-upstream-764a2c2953023f79dda1d281e5bad6c55d9881c6.zip | |
Add batch-setup option for configuring batch mode options.
Diffstat (limited to 'pts-core/functions/pts-functions_config.php')
| -rw-r--r-- | pts-core/functions/pts-functions_config.php | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php index 0fbbf70..f8f1aa6 100644 --- a/pts-core/functions/pts-functions_config.php +++ b/pts-core/functions/pts-functions_config.php @@ -16,7 +16,7 @@ function pts_config_init() pts_user_config_init(); pts_graph_config_init(); } -function pts_user_config_init($UserName = NULL, $UploadKey = NULL) +function pts_user_config_init($UserName = NULL, $UploadKey = NULL, $BatchOptions = NULL) { if(is_file(PTS_USER_DIR . "user-config.xml")) $file = file_get_contents(PTS_USER_DIR . "user-config.xml"); @@ -51,13 +51,30 @@ function pts_user_config_init($UserName = NULL, $UploadKey = NULL) $ToggleScreensaver = "TRUE"; else $ToggleScreensaver = "FALSE"; - } - + } if($UserName == NULL) $UserName = pts_read_user_config(P_OPTION_GLOBAL_USERNAME, "Default User", $read_config); if($UploadKey == NULL) $UploadKey = pts_read_user_config(P_OPTION_GLOBAL_UPLOADKEY, "", $read_config); + if($BatchOptions == NULL || !is_array($BatchOptions)) + { + $BatchOptions = array(); + $BatchOptions[0] = pts_read_user_config(P_OPTION_BATCH_SAVERESULTS, "TRUE", $read_config); + $BatchOptions[1] = pts_read_user_config(P_OPTION_BATCH_LAUNCHBROWSER, "FALSE", $read_config); + $BatchOptions[2] = pts_read_user_config(P_OPTION_BATCH_UPLOADRESULTS, "TRUE", $read_config); + $BatchOptions[3] = pts_read_user_config(P_OPTION_BATCH_PROMPTIDENTIFIER, "TRUE", $read_config); + $BatchOptions[4] = pts_read_user_config(P_OPTION_BATCH_PROMPTSAVENAME, "TRUE", $read_config); + } + else + { + $BatchOptions[0] = pts_config_bool_to_string($BatchOptions[0]); + $BatchOptions[1] = pts_config_bool_to_string($BatchOptions[1]); + $BatchOptions[2] = pts_config_bool_to_string($BatchOptions[2]); + $BatchOptions[3] = pts_config_bool_to_string($BatchOptions[3]); + $BatchOptions[4] = pts_config_bool_to_string($BatchOptions[4]); + } + $config = new tandem_XmlWriter(); $config->addXmlObject(P_OPTION_GLOBAL_USERNAME, 0, $UserName); @@ -70,15 +87,25 @@ function pts_user_config_init($UserName = NULL, $UploadKey = NULL) $config->addXmlObject(P_OPTION_TEST_SLEEPTIME, 2, pts_read_user_config(P_OPTION_TEST_SLEEPTIME, "5", $read_config)); $config->addXmlObject(P_OPTION_TEST_SCREENSAVER, 2, $ToggleScreensaver); - $config->addXmlObject(P_OPTION_BATCH_SAVERESULTS, 3, pts_read_user_config(P_OPTION_BATCH_SAVERESULTS, "TRUE", $read_config)); - $config->addXmlObject(P_OPTION_BATCH_LAUNCHBROWSER, 3, pts_read_user_config(P_OPTION_BATCH_LAUNCHBROWSER, "FALSE", $read_config)); - $config->addXmlObject(P_OPTION_BATCH_UPLOADRESULTS, 3, pts_read_user_config(P_OPTION_BATCH_UPLOADRESULTS, "TRUE", $read_config)); - $config->addXmlObject(P_OPTION_BATCH_PROMPTIDENTIFIER, 3, pts_read_user_config(P_OPTION_BATCH_PROMPTIDENTIFIER, "TRUE", $read_config)); - $config->addXmlObject(P_OPTION_BATCH_PROMPTSAVENAME, 3, pts_read_user_config(P_OPTION_BATCH_PROMPTSAVENAME, "TRUE", $read_config)); + $config->addXmlObject(P_OPTION_BATCH_SAVERESULTS, 3, $BatchOptions[0]); + $config->addXmlObject(P_OPTION_BATCH_LAUNCHBROWSER, 3, $BatchOptions[1]); + $config->addXmlObject(P_OPTION_BATCH_UPLOADRESULTS, 3, $BatchOptions[2]); + $config->addXmlObject(P_OPTION_BATCH_PROMPTIDENTIFIER, 3, $BatchOptions[3]); + $config->addXmlObject(P_OPTION_BATCH_PROMPTSAVENAME, 3, $BatchOptions[4]); + $config->addXmlObject(P_OPTION_USER_AGREEMENT, 4, $UserAgreement_MD5); file_put_contents(PTS_USER_DIR . "user-config.xml", $config->getXML()); } +function pts_config_bool_to_string($bool) +{ + if($bool == true) + $bool_return = "TRUE"; + else + $bool_return = "FALSE"; + + return $bool_return; +} function pts_graph_config_init() { if(is_file(PTS_USER_DIR . "graph-config.xml")) |