diff --git a/src/REMOTEDATA/CDAWEB.php b/src/REMOTEDATA/CDAWEB.php index c7dcaf6..607c6d9 100644 --- a/src/REMOTEDATA/CDAWEB.php +++ b/src/REMOTEDATA/CDAWEB.php @@ -14,10 +14,10 @@ class CDAWEB extends RemoteDataCenterClass private $CDAWEB = array(), $masterCDF = array(); // https://cdaweb.gsfc.nasa.gov/WS/cdasr/1/dataviews/sp_phys/instrumentTypes - private $validInstrumentTypes = [ "Activity%20Indices", "Electric%20Fields%20(space)","Gamma%20and%20X-Rays", + /*private $validInstrumentTypes = [ "Activity%20Indices", "Electric%20Fields%20(space)","Gamma%20and%20X-Rays", "Magnetic%20Fields%20(space)", "Particles%20(space)", "Plasma%20and%20Solar%20Wind", - "Radio%20and%20Plasma%20Waves%20(space)" ]; - // private $validInstrumentTypes = [ "Magnetic%20Fields%20(space)" ]; + "Radio%20and%20Plasma%20Waves%20(space)" ]; */ + private $validInstrumentTypes = [ "Magnetic%20Fields%20(space)" ]; // not used : $validInstrumentTypes = ["Ephemeris"]; @@ -420,8 +420,8 @@ class CDAWEB extends RemoteDataCenterClass $units = substr($cadence,-1); - $sampling = (int)$value*$scale[$units]; - + $sampling = floatval($value)*$scale[$units]; + return $sampling; } @@ -566,7 +566,7 @@ class CDAWEB extends RemoteDataCenterClass protected function convert2nc($file) { //TODO errors - system("cdf2nc $file"); + system("cdfnew2nc $file"); $ncFile = str_replace(".cdf", ".nc", $file); if (!file_exists($ncFile)) return false; diff --git a/src/REMOTEDATA/CDAWebConfigClass.php b/src/REMOTEDATA/CDAWebConfigClass.php index 70ee22a..868ffe7 100644 --- a/src/REMOTEDATA/CDAWebConfigClass.php +++ b/src/REMOTEDATA/CDAWebConfigClass.php @@ -16,7 +16,7 @@ class CDAWebConfigClass public static $spaseRegistry = "https://heliophysicsdata.sci.gsfc.nasa.gov/queries/CDAWeb_SPASE.xql"; // https://cdaweb.gsfc.nasa.gov/registry/hdp/NumericalData.xql : limited list // http://spase-group.org/registry/explorer/ SMWG - // Service to get SPACE description by SPASE ID (from $spaseRegistry) + // Service to get SPASE description by SPASE ID (from $spaseRegistry) public static $spaseResolver = "http://www.spase-group.org/registry/resolver?"; public static $format = "CDF"; } \ No newline at end of file diff --git a/src/REMOTEDATA/makeProxy.php b/src/REMOTEDATA/makeProxy.php index 1a7c68e..09e2032 100644 --- a/src/REMOTEDATA/makeProxy.php +++ b/src/REMOTEDATA/makeProxy.php @@ -2,7 +2,8 @@ /* * Executable to make 'base.xml' proxies for Remote Centers (DD Server) */ - + error_reporting(E_ERROR); + if (!function_exists('__autoload')) { function __autoload($class_name) { require_once $class_name . '.php'; -- libgit2 0.21.2