diff --git a/php/classes/APISMgr.php b/php/classes/APISMgr.php index 115cd54..99cea7a 100644 --- a/php/classes/APISMgr.php +++ b/php/classes/APISMgr.php @@ -27,7 +27,7 @@ function get($planet, $startTime, $stopTime, $datasets = null) { - $planetNewName = ucfirst($planet); + $planetNewName = ucfirst($planet); list($y, $mo, $d, $h, $mi, $s) = sscanf($startTime,"%4d-%02d-%02dT%02d:%02d:%02d"); $start = mktime($h,$mi,$s,$mo,$d,$y); @@ -37,10 +37,11 @@ $req = "SELECT * FROM apis.epn_core"; $req .= " WHERE target_name='".$planetNewName."'"; $req .= " AND dataproduct_type='im'"; - $req .= " AND time_min>".$this->jday($start); + $req .= " AND access_format='image/fits'"; + $req .= " AND time_min>".$this->jday($start); $req .= " AND time_min<".$this->jday($stop); - - if (isset($datasets) && !in_array("all",$datasets)) + + if (isset($datasets) && !in_array("all",$datasets)) { $req .= " AND ("; $firstDatasetId = true; @@ -72,7 +73,7 @@ curl_setopt($curl, CURLOPT_POSTFIELDS, $postfields); $req_res = curl_exec($curl); curl_close($curl); - + if (!$req_res) return array('success' => false, 'message' => 'Error during TAP request'); diff --git a/php/config.php b/php/config.php index 9d1f70c..2097fab 100644 --- a/php/config.php +++ b/php/config.php @@ -19,6 +19,9 @@ error_reporting(E_ERROR); # Load AMDA_Integration config require_once(INTEGRATION_BASE_PATH.'/config/AMDAIntegrationConfig.php'); +//Version +define('AMDA_IHM_VERSION','2.1.0'); + //AKKA - For compatibility with IHM define('BASE_PATH', IHM_SRC_DIR."/"); define('AMDA_IHM', IHM_SRC_DIR."/"); @@ -50,7 +53,7 @@ define('DISK_QUOTA_standard', 1024*1024*200); // 200MB define('MAX_FILE_INDEX_TO_SHOW', 100); // EPN-TAP services -define('EPNTAP_APIS', 'http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync'); +define('EPNTAP_APIS', 'http://voparis-tap-planeto.obspm.fr/__system__/tap/run/sync'); define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync'); // PHP run-time settings -- libgit2 0.21.2