Commit f36fc960 authored by Caillat Michel's avatar Caillat Michel
Browse files

Added an extension directory for FITS files

parent 6dab07f2
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
# #
export YAFITS_FITSDIR=/datartemix/ALMA/FITS export YAFITS_FITSDIR=/datartemix/ALMA/FITS
#
# A way to extend the disk space allocated to FITS files
# by using symbolic links defined in YAFITS_FITSDIR towards files
# or directories located in YAFITS_FITSDIR2
#
export YAFITS_FITSDIR2=/datartemix2/ALMA/FITS
# #
# Where will the temporary PNG files and log files be written. # Where will the temporary PNG files and log files be written.
# Ensure that the directories are writable by anybody or at least # Ensure that the directories are writable by anybody or at least
......
...@@ -67,14 +67,17 @@ class DataManagerImpl : ...@@ -67,14 +67,17 @@ class DataManagerImpl :
children = [] children = []
for entry in entries: for entry in entries:
p = absFITSFilePrefix + '/' + entry p = absFITSFilePrefix + '/' + entry
if entry.startswith(".") or (not os.path.isdir(p) and not p.endswith(".fits")) : condition = os.path.isfile(p) and p.endswith(".fits")
condition = condition or (os.path.islink(p) and os.path.isdir(os.readlink(p)))
condition = condition or (os.path.isdir(p))
if not condition :
continue continue
elif entry in ["log", "NOFITS", "IGNORE"]: elif entry in ["log", "NOFITS", "IGNORE"]:
continue continue
else: else:
d = dict() d = dict()
d["key"] = relKey + '/' + entry d["key"] = relKey + '/' + entry
d["folder"] = os.path.isdir(p) d["folder"] = not os.path.isfile(p)
d["lazy"] = d["folder"] d["lazy"] = d["folder"]
if entry.endswith(".fits") : if entry.endswith(".fits") :
size = DataBlock.convert_size(os.path.getsize(p)) size = DataBlock.convert_size(os.path.getsize(p))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment