CDPP / AMDA_IHM

Commit 91eef29dc065ed95890bb03d821d6805c66eb84c

Authored by Benjamin Renard
1 parent 96d948ba
Exists in master and in 9 other branches FER_11242, FER_11500, FER_11537, FER_6265, FER_9629, FER_TFCat, SpeasyGet, amdadev, openam

Fix APIS client

Showing 2 changed files with 10 additions and 6 deletions   Show diff stats
Inline Side-by-side
php/classes/APISMgr.php
  Diff comments   View file @91eef29
... ... @@ -27,7 +27,7 @@
27 27  
28 28 function get($planet, $startTime, $stopTime, $datasets = null)
29 29 {
30   - $planetNewName = ucfirst($planet);
  30 + $planetNewName = ucfirst($planet);
31 31 list($y, $mo, $d, $h, $mi, $s) = sscanf($startTime,"%4d-%02d-%02dT%02d:%02d:%02d");
32 32 $start = mktime($h,$mi,$s,$mo,$d,$y);
33 33  
... ... @@ -37,10 +37,11 @@
37 37 $req = "SELECT * FROM apis.epn_core";
38 38 $req .= " WHERE target_name='".$planetNewName."'";
39 39 $req .= " AND dataproduct_type='im'";
40   - $req .= " AND time_min>".$this->jday($start);
  40 + $req .= " AND access_format='image/fits'";
  41 + $req .= " AND time_min>".$this->jday($start);
41 42 $req .= " AND time_min<".$this->jday($stop);
42   -
43   - if (isset($datasets) && !in_array("all",$datasets))
  43 +
  44 + if (isset($datasets) && !in_array("all",$datasets))
44 45 {
45 46 $req .= " AND (";
46 47 $firstDatasetId = true;
... ... @@ -72,7 +73,7 @@
72 73 curl_setopt($curl, CURLOPT_POSTFIELDS, $postfields);
73 74 $req_res = curl_exec($curl);
74 75 curl_close($curl);
75   -
  76 +
76 77 if (!$req_res)
77 78 return array('success' => false, 'message' => 'Error during TAP request');
78 79  
... ...
php/config.php
  Diff comments   View file @91eef29
... ... @@ -19,6 +19,9 @@ error_reporting(E_ERROR);
19 19 # Load AMDA_Integration config
20 20 require_once(INTEGRATION_BASE_PATH.'/config/AMDAIntegrationConfig.php');
21 21  
  22 +//Version
  23 +define('AMDA_IHM_VERSION','2.1.0');
  24 +
22 25 //AKKA - For compatibility with IHM
23 26 define('BASE_PATH', IHM_SRC_DIR."/");
24 27 define('AMDA_IHM', IHM_SRC_DIR."/");
... ... @@ -50,7 +53,7 @@ define(&#39;DISK_QUOTA_standard&#39;, 1024*1024*200); // 200MB
50 53 define('MAX_FILE_INDEX_TO_SHOW', 100);
51 54  
52 55 // EPN-TAP services
53   -define('EPNTAP_APIS', 'http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync');
  56 +define('EPNTAP_APIS', 'http://voparis-tap-planeto.obspm.fr/__system__/tap/run/sync');
54 57 define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
55 58  
56 59 // PHP run-time settings
... ...