improve hierarchy and update file paths.

Nathanael Jourdane
1 parent a0cfe93a
Showing 7 changed files with 11 additions and 21 deletions Show diff stats
DaCHS/build_BDD.py
get_cdf.php -> converter/get_cdf.php
nc2cdf.py -> converter/nc2cdf.py
create_granules.py
doc/CDF_spec.md -> specs/CDF_spec.md
doc/spase-2_2_6.xsd -> specs/spase-2_2_6.xsd
doc/spase-amda-1_3_0.xsd -> specs/spase-amda-1_3_0.xsd
@@ -24,11 +24,10 @@ SQLDic = Dict[str, object]
 SpaseDic = Dict[str, List[ElTr.Element]]
  
 # Paths
-WORKING_DIR = op.dirname(op.dirname(op.abspath(__file__)))
-OUTPUT_PATH = op.join(WORKING_DIR, 'SERVER')
-SQL_FILE_PATH = op.join(OUTPUT_PATH, 'amdadb_db.sql')
+WORKING_DIR = op.dirname(op.abspath(__file__))  # parent directory
+OUTPUT_SQL_FILE_PATH = op.join(WORKING_DIR, 'DaCHS', 'amdadb_db.sql')
 SPASE_DIR = op.join(WORKING_DIR, 'DATA')
-LOG_FILE_PATH = op.join(WORKING_DIR, 'build_granules.log')  # Set to None if you want to log in stdout instead of a file
+LOG_FILE_PATH = op.join(WORKING_DIR, 'log', 'build_granules.log')  # Set to None if you want to log in stdout instead of a file
  
 # XML and SQL formats
 XMLNS = 'http://www.spase-group.org/data/schema'
@@ -544,7 +543,7 @@ Return a list containing the granules, where each granule is a dictionary, with:
 def write_sql(granules_list):
     """Write a SQL script which insert all the granules in the database."""
  
-    with open(SQL_FILE_PATH, 'w') as sql_file:
+    with open(OUTPUT_SQL_FILE_PATH, 'w') as sql_file:
         sql_file.write(SQL_HEADER)
         for gr in granules_list:
             keys = ', '.join(gr.keys())
@@ -573,4 +572,4 @@ if __name__ == &#39;__main__&#39;:
  
     import subprocess
  
-    subprocess.Popen(['notify-send', 'The SQL script %s has been generated.' % SQL_FILE_PATH])
+    subprocess.Popen(['notify-send', 'The SQL script %s has been generated.' % OUTPUT_SQL_FILE_PATH])
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
  
-# interpreter: Python 3.6 with anaconda. Please set and prepare the conda environment.
-# set PATH $HOME/.anaconda2/bin/ $PATH; and source $HOME/.anaconda2/etc/fish/conf.d/conda.fish
-# set PATH $HOME/.anaconda3/bin/ $PATH; and source $HOME/.anaconda3/etc/fish/conf.d/conda.fish
-# Add this lines in your init.fish (adapt for Bash terms), so you can choose which conda version to use:
-# conda3 # Using conda3
-# conda create --name granules # 1st time only
-# activate granules # or `conda activate granules` in Bash terms
-# conda install netCDF4 # 1st time only
-
 """This script download all files from a ``SPASE`` registry, then log and correct eventual errors
 and add several files and information, such as granules estimation size."""
  
@@ -42,10 +33,10 @@ NUMDATA_KEYWORDS = [&#39;/NumericalData/&#39;, &#39;/NumericalOutput/&#39;]
 GRANULE_KEYWORD = '/Granules/'
  
 # local paths
-BASE_DIR = op.dirname(op.dirname(op.abspath(__file__)))
-SPASE_DIR = op.join(BASE_DIR, 'DATA')  # /!\ Double-check this : this directory will be recursively deleted.
-LOG_FILE_PATH = op.join(BASE_DIR, 'create_granules.log')
-BLACKLIST_PATH = op.join(BASE_DIR, 'blacklist')
+WORKING_DIR = op.dirname(op.abspath(__file__))  # current directory
+SPASE_DIR = op.join(WORKING_DIR, 'DATA')  # /!\ Double-check this : this directory will be recursively deleted.
+LOG_FILE_PATH = op.join(WORKING_DIR, 'log', 'create_granules.log')
+BLACKLIST_PATH = op.join(WORKING_DIR, 'resources', 'blacklist')
  
 LOG_FILE = open(LOG_FILE_PATH, 'w+')  # Please set to None if you want to log in stdout instead of a file.
  
@@ -438,8 +429,8 @@ def write_all_granules() -&gt; None:
  
  
 if __name__ == '__main__':
-    if not op.exists(BASE_DIR):
-        makedirs(BASE_DIR)
+    if not op.exists(WORKING_DIR):
+        makedirs(WORKING_DIR)
  
     if op.isdir(SPASE_DIR):
         print('Clearing SPASE directory (%s)...' % SPASE_DIR)