From d85edc52219c83a76a18465a266caf40c58d0136 Mon Sep 17 00:00:00 2001 From: Triatmoko Date: Thu, 17 Nov 2011 00:22:13 +0100 Subject: copy flush handling from website folder --- Under-Testing/Website/mutexSmartTest.php | 29 ++++++++++++++--------------- Under-Testing/Website/mutexTry.php | 15 ++++++++------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'Under-Testing') diff --git a/Under-Testing/Website/mutexSmartTest.php b/Under-Testing/Website/mutexSmartTest.php index d5fe146..0d535f9 100644 --- a/Under-Testing/Website/mutexSmartTest.php +++ b/Under-Testing/Website/mutexSmartTest.php @@ -11,6 +11,9 @@
'."\n"; + ob_implicit_flush(1); echo '
@@ -126,11 +130,8 @@ if ($locking == '1') //1 means nobody is on the website '; - echo str_repeat("\n",7024); - flush(); - + ob_implicit_flush(1); } - elseif ($received == "TEST DONE\n") { if ($taskAmount == "ON") @@ -138,15 +139,14 @@ if ($locking == '1') //1 means nobody is on the website $taskAmount = "SMART TEST"; } - echo ' + echo '
'; echo '
'; echo '"; echo ''; - echo str_repeat("\n",7024); - flush(); - usleep(100); + ob_implicit_flush(1); + usleep(100); fwrite($fp, 'DISCONNECT'); //tell the testing software it may close break; } @@ -442,10 +442,8 @@ if ($locking == '1') //1 means nobody is on the website { $NANOBTS2P= 2; } - } - }// - + } } if($callFrom == 'GSMEXT.O2' || $callTo == 'GSMEXT.O2') { @@ -898,8 +896,7 @@ if ($locking == '1') //1 means nobody is on the website ' . $dataForTable[4] . ' ' . $dataForTable[3] . ' '; - echo str_repeat("\n",7024); - flush(); + ob_implicit_flush(1); usleep(100); //tell the software to proceed with the test and confirm receiving data fwrite($fp, "CONTINUE"); @@ -913,12 +910,14 @@ if ($locking == '1') //1 means nobody is on the website elseif($controller == '1') { echo 'Testing software was not started(didn\'t obtain the lock)! Check it!'; - echo 'Soulution : Check login information in DBClass.py'; + echo 'Soulution : Check login information (username, password, db name) in DBClass.py'; + echo ' Check manual start manually gsmselftest.py (./gsmselftest.py)'; } else { echo 'Testing software didn\'t obtain the lock'; echo 'Soulution : Check login information in DBClass.py'; + echo ' Check manual start manually gsmselftest.py (./gsmselftest.py)'; } } elseif($StartSoftware == '0') //0 means the software is still running in the background diff --git a/Under-Testing/Website/mutexTry.php b/Under-Testing/Website/mutexTry.php index 3bf32c8..20da2a4 100755 --- a/Under-Testing/Website/mutexTry.php +++ b/Under-Testing/Website/mutexTry.php @@ -8,6 +8,9 @@
'."\n"; + ob_implicit_flush(1); echo '
@@ -141,9 +145,8 @@ if ($locking == '1') //1 means nobody is on the website echo '"; echo ''; - echo str_repeat("\n",7024); - flush(); - usleep(100); + ob_implicit_flush(1); + usleep(100); fwrite($fp, 'DISCONNECT'); //tell the testing software it may close break; } @@ -901,9 +904,7 @@ if ($locking == '1') //1 means nobody is on the website '; - - echo str_repeat("\n",7024); - flush(); + ob_implicit_flush(1); usleep(100); fwrite($fp, "CONTINUE"); //tell the software to proceed with the test and confirm receiving data } -- cgit v1.2.3-55-g7522
' . $dataForTable[4] . ' ' . $dataForTable[3] . '