https://gitlab.irap.omp.eu/CDPP/CDF_tools/commit/c9ab9b8d233d16c76f6c51838461c7a18346d4ed

Elena.Budnik
1 parent 7d7445ea
Showing 2 changed files with 16 additions and 3 deletions Show diff stats
src/DDSERVICES/REST/get_cdf.php
src/DDSERVICES/REST/nc2cdf.py
@@ -14,7 +14,7 @@ if (!$_GET[&#39;id&#39;]) {
  
 require_once './DDserverWeb_ini.php';
  
-$name = preg_replace('/\..*/', '', $_GET['id']); // ie. ACE/SW/sw19980204
+$name = preg_replace('/(.*\/.*\/.*)(\..*)/', '${1}', $_GET['id']); // ie. ACE/SW/sw19980204
 $inputFilePath = baseDir . $name . '.nc.gz'; // ie. /data/DDBASE/DATA/ACE/SW/sw19980204.nc.gz
 $outputFilePath = $tmpDir . str_replace('/', '_', $name) . '.cdf'; // ie. /tmp/ACE_SW_sw19980204.cdf
  
@@ -14,10 +14,13 @@ os.environ[&#39;SPACEPY&#39;] = &#39;/tmp&#39;
 import netCDF4
 from spacepy import pycdf
  
-AMDA_DICT_PATH = './amda.json'
 TEMP_FILE = '/tmp'
  
  
+
+RESOLVER_URL = 'http://apus.irap.omp.eu:8080/amda-registry/resolver'
+
+
 def error(error_message, e=None):
     """ Display an `error_message` and exit the program. """
  
@@ -140,10 +143,20 @@ class NetCdf:
  
         # Make the pyCDF object
         try:
-            return pycdf.CDF(cdf_path, '')
+            cdf = pycdf.CDF(cdf_path, '')
         except pycdf.CDFError as e:
             error('Can not create CDF file on %s, check that the directory exists and its writing access' % cdf_path, e)
  
+        # TODO Get spase file
+
+        get_spase()
+
+        cdf.attrs['Acknowledgement '] = 'John Doe'
+
+        return cdf
+
+    def get_spase(self):
+
     @staticmethod
     def build_temp_path(path, extension):
         return op.abspath(op.join(TEMP_FILE, op.basename(path).split('.')[0] + extension))