Merge branch 'master' into expression-parser-bre

Benjamin Renard
2 parents 14ae289b e2644543
Showing 5 changed files with 20 additions and 13 deletions Show diff stats
help/parameters/tilt_dipole.pdf
php/WebServices/Tests/Base/TestsSuite.php
php/WebServices/Tests/Suite/TestGetObsDataTree_40.php
php/classes/AmdaAction.php
php/wsTests.php
@@ -55,7 +55,7 @@ class TestsSuite {
 				);
 				if (!$descriptionsOnly) {
 					$runFunc = "run".$ws_type;
-					$res["status"] = $test->$runFunc(BASE_URL);
+					$res["status"] = $test->$runFunc(webAlias);
 				}
 				$results[] = $res;
 			}
@@ -31,7 +31,7 @@ class TestGetObsDataTree_40 extends TestAbstract
 			);
 		}
 		$nodes = $doc->getElementsByTagName('LocalDataBaseParameters');
-		if ($nodes->count() == 0) {
+		if ($nodes->length == 0) {
 			return array(
 				'success' => FALSE,
 				'message' => 'Cannot retrieve LocalDataBaseParameters node',
@@ -250,17 +250,24 @@ class AmdaAction
 								$info = $child->getAttribute('desc');
  
 								if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) {
-									$info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
-
+                                    $dataStart = $child->getAttribute('dataStart');
+                                    // check UTC format
+                                    if ( !preg_match('/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/', $dataStart ) ) {
+                                        if ( $dataStart == "MissionDependent" )
+                                            $info .= "<br/>Time Range : depending on mission selection"; 
+                                        else 
+                                            $info .= "<br/>Time Range : undefined"; 
+                                        $child->setAttribute('dataStart', date("Y-m-d\TH:i:s\Z", strtotime(' -1 day')));
+                                        $child->setAttribute('dataStop', date("Y-m-d\TH:i:s\Z", time()));                                        
+                                    } else {
+                                        $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
+                                    }
+                                    
 									if ($child->hasAttribute('lastUpdate')) {
 										$info .= "<br/>Last Updated: : ".$child->getAttribute('lastUpdate');
 									}
 								}
-
-								if ($child->getAttribute('dataStart') == 'depending on mission') {
-									$info .= "<br/>Time Range: ".$child->getAttribute('dataStart');
-								}
-
+								
 // 								if ($child->getAttribute('restriction') > 1) {
 // 									$restricted  = $child->getAttribute('restriction');
 // 									$info .= "<br/><b>Time Restriction</b>: -$restricted days";
@@ -279,7 +286,9 @@ class AmdaAction
  
 							if ($child->tagName == 'parameter') {
 								$isParameter = true;
-
+                                if ($child->hasAttribute('TemplatedParameter'))
+                                    $needsArgs = true;
+                                    
 								if ($child->parentNode->hasAttribute('dataStart')) {
 									$globalStart = $child->parentNode->getAttribute('dataStart');
 									$globalStop = $child->parentNode->getAttribute('dataStop');
@@ -7,8 +7,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . &quot;WebServices/Tests/&quot;);
  
 require_once("Base/TestsSuite.php");
  
-define("BASE_URL","http://127.0.0.1");
-
 $suite = new TestsSuite();
 $suite->init('WebServices/Tests/Suite');
 $results = $suite->run();
@@ -16,7 +14,7 @@ $results = $suite-&gt;run();
 $error = FALSE;
 foreach ($results as $result) {
 	if (!$result['status']['success']) {
-		echo "[ERROR] ".$result['name']." - ".$result['status']['message'].PHP_EOL;
+		echo "[ERROR] ".$result['name']." - ".$result['type']." - ".$result['status']['message'].PHP_EOL;
 		$error = TRUE;
 	}
 }