Merge branch 'webservices' into 'master'

Webservices See merge request !38

Merge branch 'webservices' into 'master'
Webservices See merge request !38
Elena Budnik
2 parents 8da91bff 189a6f4f
Showing 4 changed files with 95 additions and 39 deletions Show diff stats
php/WebServices/WebServer.php
php/rest/getDataset.php
php/rest/getOrbites.php
php/rest/getParameter.php
@@ -286,17 +286,6 @@ class WebServer
 			$this->throwError("deleteProcessError", $e->getMessage());
 		}
 	}
-
-/*
-*   generate AUTH token for access to REST services 
-*/
-	public function getNewToken()
-	{
-		// generate token from timeStamp and some salt
-		$newToken = md5(1321 * (int)( time() / WSConfigClass::$timeLimitQuery));
-		
-		return array('success' => true, 'token' => $newToken);
-	}
 	private function excludePrivateNodes($locParamSrc, $locParamDst)
 	{
@@ -325,8 +314,24 @@ class WebServer
 			$this->throwError('workspaceError', 'Cannot save Amda Local DataBase Parameters description file'.$this->userID);   
 	}
+	private function checkInputTime($startTime, $stopTime) 
+	{
+		if ($stopTime <= $startTime ) 
+			$this->throwError("requestError", "Requested time interval should be greater than 0"); 
+	}
+	
 /************************** WEB SERVICES **************************************/	
-
+/*
+*   generate AUTH token for access to REST services 
+*/
+	public function getNewToken()
+	{
+		// generate token from timeStamp and some salt
+		$newToken = md5(1321 * (int)( time() / WSConfigClass::$timeLimitQuery));
+		
+		return array('success' => true, 'token' => $newToken);
+	}
+	
 /*
 *   public data only : user impex
 */
@@ -390,18 +395,25 @@ class WebServer
 		$this->initUserMgr();
 		$vars = $res['vars'];
-
-		if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
-			$this->throwError("requestError", "Requested time interval should be greater than 0");
+		
+		if (is_numeric($vars["startTime"])) {
+			$this->checkInputTime($vars["startTime"],$vars["stopTime"]);
+			$vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
+			$vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
+		}
+		else {
+			$this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"])); 
 		}
-		$paramId = array();
-		array_push($paramId, $vars["parameterID"]);
-
-		if (!$vars["timeFormat"])
+		if (!$vars["timeFormat"]) {
 			$timeFormat = "ISO8601";
-		else
+		}
+		else {
 			$timeFormat = $vars["timeFormat"];
+		}
+		
+		$paramId = array();
+		array_push($paramId, $vars["parameterID"]);
 		if (!$vars["gzip"])
 			$gzip = 0;
@@ -465,11 +477,23 @@ class WebServer
 		$this->initUserMgr();
 		$vars = $res['vars'];
-
-		if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
-			$this->throwError("requestError", "Requested time interval should be greater than 0");
-		}
+		if (is_numeric($vars["startTime"])) {
+			$this->checkInputTime($vars["startTime"],$vars["stopTime"]);
+			$vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
+			$vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
+		}
+		else {
+			$this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"])); 
+		}
+	 
+		if (!$vars["timeFormat"]) {
+			$timeFormat = "ISO8601";
+		}
+		else {
+			$timeFormat = $vars["timeFormat"];
+		}
+	
 		$dataSetDom = $this->getDatasetInfo($vars['datasetID']);
 		$params = $dataSetDom->getElementsByTagName("parameter");
@@ -506,11 +530,6 @@ class WebServer
 			$sampling = $vars["sampling"];
 		}
-		if (!$vars["timeFormat"])
-			$timeFormat = "ISO8601";
-		else
-			$timeFormat = $vars["timeFormat"];
-
 		if (!$vars["gzip"])
 			$gzip = 0;
 		else
@@ -642,11 +661,23 @@ class WebServer
 		$this->initUserMgr();
 		$vars = $res['vars'];
-
-		if (strtotime($vars["stopTime"]) <= strtotime($vars["startTime"])){
-			$this->throwError("requestError", "Requested time interval should be greater than 0");
+		
+		if (is_numeric($vars["startTime"])) {
+			$this->checkInputTime($vars["startTime"],$vars["stopTime"]);
+			$vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
+			$vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
+		}
+		else {
+			$this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"])); 
+		}
+	 
+		if (!$vars["timeFormat"]) {
+			$timeFormat = "ISO8601";
+		}
+		else {
+			$timeFormat = $vars["timeFormat"];
 		}
-         
+		
 		$spacecraft = $vars["spacecraft"];
 		$coordinateSystem = $vars["coordinateSystem"];
@@ -667,11 +698,6 @@ class WebServer
 		$paramId = array();
 		array_push($paramId, $orbitParam['parameterID']);
-		if (!$vars["timeFormat"])
-			$timeFormat = "ISO8601";
-		else
-			$timeFormat = $vars["timeFormat"];
-
 		if (!$vars["gzip"])
 			$gzip = 0;
 		else
@@ -705,6 +731,15 @@ class WebServer
 		$vars = $res['vars'];
 		$mission = $vars["missionID"];
+		if (is_numeric($vars["startTime"])) {
+			$this->checkInputTime($vars["startTime"],$vars["stopTime"]);
+			$vars["startTime"] = date("Y-m-d\TH:i:s", $vars["startTime"]);
+			$vars["stopTime"] = date("Y-m-d\TH:i:s", $vars["stopTime"]);
+		}
+		else {
+			$this->checkInputTime(strtotime($vars["startTime"]),strtotime($vars["stopTime"])); 
+		}
+	 
 		$resultFilePrefix = strtolower(__FUNCTION__)."_".$mission."_".date("YmdHms",strtotime($vars["startTime"]))."_".date("YmdHms",strtotime($vars["stopTime"]));
 		if ($this->userID != "impex") 
@@ -41,7 +41,14 @@
 		$result = array('success' => false, 'message' => "Authentication is required for this webservice.");
 		exit(json_encode($result));
 	}
-
+	
+	if ($_GET['startTime'] && strpos($_GET['startTime'], ' ') !== false) 
+	{
+		$result = array('success' => false, 
+					'message' => "Check that there is no + (plus) character in your time definition. + is a special character and should be encoded by %2B");
+		exit(json_encode($result));
+	}
+	
 	$amda_ws = new WebServer();
 	if ($amda_ws->getNewToken()['token'] != $_GET["token"]) 
@@ -52,6 +52,13 @@
 		exit(json_encode($result));
 	} 
+	if ($_GET['startTime'] && strpos($_GET['startTime'], ' ') !== false) 
+	{
+		$result = array('success' => false, 
+					'message' => "Check that there is no + (plus) character in your time definition. + is a special character and should be encoded by %2B");
+		exit(json_encode($result));
+	}
+	
 	$amda_ws = new WebServer();
 	if ($amda_ws->getNewToken()['token'] != $_GET["token"]) 
@@ -42,6 +42,13 @@
 		$result = array('success' => false, 'message' => "Authentication is required for this webservice.");
 		exit(json_encode($result));
 	} 
+	 
+	if ($_GET['startTime'] && strpos($_GET['startTime'], ' ') !== false) 
+	{
+		$result = array('success' => false, 
+					'message' => "Check that there is no + (plus) character in your time definition. + is a special character and should be encoded by %2B");
+		exit(json_encode($result));
+	}
 	$amda_ws = new WebServer();