From 1abe728dce4ba0810a1a7c3671514a8e703aa3a9 Mon Sep 17 00:00:00 2001
From: shoulinwei <weishoulin@astrolab.cn>
Date: Tue, 6 Apr 2021 22:38:24 +0800
Subject: [PATCH] fill file_path

---
 csst_dfs_api_local/ifs/fits.py    | 9 ++++++---
 csst_dfs_api_local/ifs/reffits.py | 8 ++++++--
 csst_dfs_api_local/ifs/result0.py | 8 ++++++--
 csst_dfs_api_local/ifs/result1.py | 9 ++++++---
 tests/test_ifs_fits.py            | 7 +++++++
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/csst_dfs_api_local/ifs/fits.py b/csst_dfs_api_local/ifs/fits.py
index 0574c70..838c8d7 100644
--- a/csst_dfs_api_local/ifs/fits.py
+++ b/csst_dfs_api_local/ifs/fits.py
@@ -66,9 +66,10 @@ class FitsApi(object):
         
         if file_name:
             sql = ["select * from ifs_rawfits where filename='" + file_name + "'"]
-        _, r = self.db.select_many("".join(sql))
-
-        return r
+        _, recs = self.db.select_many("".join(sql))
+        for r in recs:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])
+        return recs
 
     def get(self, **kwargs):
         '''
@@ -80,6 +81,8 @@ class FitsApi(object):
         fits_id = get_parameter(kwargs, "fits_id", -1)
         r = self.db.select_one(
             "select * from ifs_rawfits where id=?", (fits_id,))
+        if r:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])
         return r
 
     def read(self, **kwargs):
diff --git a/csst_dfs_api_local/ifs/reffits.py b/csst_dfs_api_local/ifs/reffits.py
index 18733a1..2fe7585 100644
--- a/csst_dfs_api_local/ifs/reffits.py
+++ b/csst_dfs_api_local/ifs/reffits.py
@@ -67,9 +67,11 @@ class RefFitsApi(object):
         if file_name:
             sql = ["select * from ifs_ref_fits where filename='" + file_name + "'"]
         sql.append(" order by exp_time desc")
-        _, r = self.db.select_many("".join(sql))
+        _, recs = self.db.select_many("".join(sql))
 
-        return r
+        for r in recs:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])
+        return recs
 
     def get(self, **kwargs):
         '''query database, return a record as dict
@@ -82,6 +84,8 @@ class RefFitsApi(object):
         fits_id = get_parameter(kwargs, "fits_id", -1)
         r = self.db.select_one(
             "select * from ifs_ref_fits where id=?", (fits_id,))
+        if r:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])            
         return r
 
     def read(self, **kwargs):
diff --git a/csst_dfs_api_local/ifs/result0.py b/csst_dfs_api_local/ifs/result0.py
index 40d2ff0..4fd63cb 100644
--- a/csst_dfs_api_local/ifs/result0.py
+++ b/csst_dfs_api_local/ifs/result0.py
@@ -47,9 +47,11 @@ class Result0Api(object):
         if file_name:
             sql = ["select * from ifs_result_0 where filename='" + file_name + "'"]
 
-        _, r = self.db.select_many("".join(sql))
+        _, recs = self.db.select_many("".join(sql))
 
-        return r
+        for r in recs:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])
+        return recs
         
     def get(self, **kwargs):
         ''' query database, return a record as dict
@@ -62,6 +64,8 @@ class Result0Api(object):
         fits_id = get_parameter(kwargs, "fits_id", -1)
         r = self.db.select_one(
             "select * from ifs_result_0 where id=?", (fits_id,))
+        if r:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])            
         return r
 
     def read(self, **kwargs):
diff --git a/csst_dfs_api_local/ifs/result1.py b/csst_dfs_api_local/ifs/result1.py
index 8977a06..2a5924b 100644
--- a/csst_dfs_api_local/ifs/result1.py
+++ b/csst_dfs_api_local/ifs/result1.py
@@ -39,9 +39,11 @@ class Result1Api(object):
 
         if file_name:
             sql = ["select * from ifs_result_1 where filename='" + file_name + "'"]
-        _, r = self.db.select_many("".join(sql))
+        _, recs = self.db.select_many("".join(sql))
 
-        return r
+        for r in recs:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])
+        return recs
 
     def get(self, **kwargs):
         '''
@@ -56,7 +58,8 @@ class Result1Api(object):
             
         _, result0s = self.db.select_many(
             "select result0_id, create_time from ifs_result_0_1 where result1_id=?", (fits_id,))
-
+        if r:
+            r['file_path'] = os.path.join(self.root_dir, r['file_path'])
         return r, result0s
 
     def read(self, **kwargs):
diff --git a/tests/test_ifs_fits.py b/tests/test_ifs_fits.py
index 7b8c40a..64ae1a5 100644
--- a/tests/test_ifs_fits.py
+++ b/tests/test_ifs_fits.py
@@ -9,6 +9,13 @@ class IFSFitsTestCase(unittest.TestCase):
     def setUp(self):
         self.api = FitsApi()
 
+    def test_get(self):
+        r = self.api.get(fits_id=1111)
+        print('get:', r)
+
+        r = self.api.get(fits_id=1)
+        print('get:', r)
+
     def test_find(self):
         recs = self.api.find(file_name='CCD1_ObsTime_300_ObsNum_7.fits')
         print('find:', recs)
-- 
GitLab