CDPP / DDServer

Commit 36b01ac2e1bc6a980aa22443cfc27ff77d78b9eb

Authored by Elena.Budnik
1 parent 20306440
Exists in master and in 9 other branches WIP, clean_real, create-user, epntap, evol_9042, fix-cdaweb, sqlite_test, time-in-double, ubuntu

set utc time zone, correct contacation constant + var for php 2.4

Showing 3 changed files with 7 additions and 6 deletions   Show diff stats
Inline Side-by-side
src/REMOTEDATA/RemoteDataCenterClass.php
  Diff comments   View file @36b01ac
... ... @@ -30,6 +30,7 @@ abstract class RemoteDataCenterClass
30 30 {
31 31 $this->baseID = get_class($this);
32 32 $this->location = RemoteData."/bases/".$this->baseID;
  33 + date_default_timezone_set('UTC');
33 34 }
34 35  
35 36 /* Function to change External Bases stuff in case of existing AMDA aliases.
... ...
src/REMOTEDATA/THEMIS.php
  Diff comments   View file @36b01ac
... ... @@ -8,26 +8,26 @@ class THEMIS extends RemoteDataCenterClass
8 8 {
9 9 // /THEMIS_B1/themisdata
10 10  
11   - protected $baseMgr;
  11 + protected $baseMgr;
12 12 protected $domTemplate;
13   -
  13 + protected $xmlTemplate;
14 14  
15 15 public function init()
16 16 {
17 17 error_log("THEMIS Proxy creation on ".date("Y-m-d\TH:i:s").PHP_EOL,3,log);
18 18 error_log("THEMIS Proxy creation on ".date("Y-m-d\TH:i:s").PHP_EOL,3,err);
19   -
  19 + $this->xmlTemplate = strval(RemoteData).ThemisConfigClass::$TemplateXml;
20 20 }
21 21  
22 22 protected function getRemoteTree()
23 23 {
24   - if (!file_exists(ThemisConfigClass::$TemplateXml)) {
  24 + if (!file_exists($this->xmlTemplate)) {
25 25 error_log('Cannot find THEMIS tree template'.PHP_EOL,3,err);
26 26 exit('Cannot find THEMIS tree template');
27 27 }
28 28  
29 29 $this->domTemplate = new DomDocument("1.0");
30   - if (!$this->domTemplate->load(ThemisConfigClass::$TemplateXml)) {
  30 + if (!$this->domTemplate->load($this->xmlTemplate)) {
31 31 error_log('Cannot load THEMIS tree template'.PHP_EOL,3,err);
32 32 exit('Cannot load THEMIS tree template');
33 33 }
... ...
src/REMOTEDATA/ThemisConfigClass.php
  Diff comments   View file @36b01ac
... ... @@ -14,7 +14,7 @@ class ThemisConfigClass
14 14 public static $level = "l2";
15 15 public static $format = "cdf";
16 16 public static $themis = array('A'); //, 'B', 'C', 'D', 'E');
17   - public static $TemplateXml = RemoteData."/ThemisTreeTemplate.xml";
  17 + public static $TemplateXml = "/ThemisTreeTemplate.xml";
18 18 public static $START_YEAR = "2007";
19 19 public static $program = array('peim' => 'themis_esamom2nc', 'peem' => 'themis_esamom2nc',
20 20 'peif' => 'themis_esa2nc', 'peef' => 'themis_esa2nc',
... ...