CDPP / DDServer

Commit 2f2f6cee2b4b3c4933381c0b6e4949d24104e52a

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

FillValue by default

Showing 2 changed files with 8 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/DATA/MANAGER/DDBaseMgr.php
  Diff comments   View file @2f2f6ce
... ... @@ -12,7 +12,7 @@ class DDBaseMgr
12 12 private $ViId, $remoteViId;
13 13 private $DDsysDoc, $DDsys;
14 14 private $base, $mission, $instrument;
15   - private $min_sampling, $max_sampling;
  15 + private $min_sampling, $max_sampling, $fillValue = null;
16 16 public $location, $ViDir;
17 17 public $globalStart = null, $globalStop = null;
18 18  
... ... @@ -74,6 +74,7 @@ class DDBaseMgr
74 74  
75 75 if (!$infoXml->load($infoXmlFile))
76 76 return -10;
  77 +
77 78 $this->base = $base;
78 79 $this->mission = $infoXml->getElementsByTagName("Mission")->item(0)->nodeValue;
79 80 $this->instrument = $infoXml->getElementsByTagName("Instrument")->item(0)->nodeValue;
... ... @@ -81,7 +82,9 @@ class DDBaseMgr
81 82 $this->remoteViId = $ds;
82 83 $this->globalStart = $infoXml->getElementsByTagName("GlobalStart")->item(0)->nodeValue;
83 84 $this->globalStop = $infoXml->getElementsByTagName("GlobalStop")->item(0)->nodeValue;
84   -
  85 + $fillValue = $infoXml->getElementsByTagName("FillValue");
  86 + if ($fillValue->length > 0) $this->fillValue = $fillValue->item(0)->nodeValue;
  87 +
85 88 $this->location = getenv("DDBASE")."/".$this->base."/".strtoupper($this->ViId)."/";
86 89 $this->ViDir = $this->location;
87 90 //--------- Check if additional Info should be added to VI
... ... @@ -172,6 +175,8 @@ class DDBaseMgr
172 175 $rootElement->appendChild($xml_dom->createElement("MinSampling", $this->min_sampling));
173 176 if ($this->max_sampling > $this->min_sampling)
174 177 $rootElement->appendChild($xml_dom->createElement("MaxSampling", $this->max_sampling));
  178 + if ($this->fillValue)
  179 + $rootElement->appendChild($xml_dom->createElement("FillValue", $this->fillValue));
175 180 $rootElement->appendChild($xml_dom->createElement("LocalStart"));
176 181 $rootElement->appendChild($xml_dom->createElement("LocalStop"));
177 182 $xml_dom->appendChild($rootElement);
... ...
src/REMOTEDATA/CDAWEB.php
  Diff comments   View file @2f2f6ce
... ... @@ -351,7 +351,7 @@ class CDAWEB extends RemoteDataCenterClass
351 351 $rootNode->appendChild($this->DDserverXml->createElement("GlobalStop"));
352 352 $rootNode->appendChild($this->DDserverXml->createElement("MinSampling"));
353 353 // fill value by default - if different - add into param description
354   - $rootNode->appendChild($this->DDserverXml->createElement("FillValue"), -1.0E31);
  354 + $rootNode->appendChild($this->DDserverXml->createElement("FillValue", -1.0E31));
355 355 }
356 356  
357 357 protected function updateDDServerXml($target, $value)
... ...