From 90a3e69fe48d9b7754fc17a167c73af50655cf3e Mon Sep 17 00:00:00 2001
From: shoulinwei <weishoulin@astrolab.cn>
Date: Thu, 16 Jun 2022 08:23:22 +0800
Subject: [PATCH] object name

---
 csst_dfs_api_local/common/db.sql |  1 +
 csst_dfs_api_local/ifs/ingest.py |  7 ++++---
 csst_dfs_api_local/ifs/level0.py | 19 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/csst_dfs_api_local/common/db.sql b/csst_dfs_api_local/common/db.sql
index 961f420..a6a30d9 100644
--- a/csst_dfs_api_local/common/db.sql
+++ b/csst_dfs_api_local/common/db.sql
@@ -300,6 +300,7 @@ create table ifs_level0_data
    level0_id            varchar(20) not null,
    obs_id               varchar(10) not null,
    detector_no          varchar(10) not null,
+   object_name          varchar(64) not null,
    obs_type             varchar(16),
    obs_time             datetime,
    exp_time             float,
diff --git a/csst_dfs_api_local/ifs/ingest.py b/csst_dfs_api_local/ifs/ingest.py
index 6c2ce56..7c649db 100644
--- a/csst_dfs_api_local/ifs/ingest.py
+++ b/csst_dfs_api_local/ifs/ingest.py
@@ -51,6 +51,7 @@ def ingest_one(file_path, db, copyfiles):
     
     module_id = header["INSTRUME"]
     obs_type = header["OBSTYPE"]
+    object_name = header["OBJECT"]
     qc0_status = -1
     prc_status = -1
     time_now = datetime.datetime.now()
@@ -92,9 +93,9 @@ def ingest_one(file_path, db, copyfiles):
     level0_id = f"{obs_id}{detector}"  
 
     c = db.execute("insert into ifs_level0_data \
-        (level0_id, obs_id, detector_no, obs_type, obs_time, exp_time,detector_status_id, filename, file_path,qc0_status, prc_status,create_time) \
-        values (?,?,?,?,?,?,?,?,?,?,?,?)",
-        (level0_id, obs_id, detector, obs_type, exp_start_time, exp_time, detector_status_id, filename, file_full_path, qc0_status, prc_status,create_time))
+        (level0_id, obs_id, detector_no, object_name, obs_type, obs_time, exp_time,detector_status_id, filename, file_path,qc0_status, prc_status,create_time) \
+        values (?,?,?,?,?,?,?,?,?,?,?,?,?)",
+        (level0_id, obs_id, detector, object_name, obs_type, exp_start_time, exp_time, detector_status_id, filename, file_full_path, qc0_status, prc_status,create_time))
     db.end()
     level0_id_id = db.last_row_id()
     #level0-header
diff --git a/csst_dfs_api_local/ifs/level0.py b/csst_dfs_api_local/ifs/level0.py
index 7752e0d..91fd2ec 100644
--- a/csst_dfs_api_local/ifs/level0.py
+++ b/csst_dfs_api_local/ifs/level0.py
@@ -21,13 +21,14 @@ class Level0DataApi(object):
         ''' retrieve level0 records from database
 
         parameter kwargs:
-            obs_id: [str]
-            detector_no: [str]
-            obs_type: [str]
+            obs_id: [str],
+            detector_no: [str],
+            obs_type: [str],
+            object_name: [str],
             obs_time : (start, end),
             qc0_status : [int],
             prc_status : [int],
-            file_name: [str]
+            file_name: [str],
             limit: limits returns the number of records,default 0:no-limit
 
         return: csst_dfs_common.models.Result
@@ -36,6 +37,7 @@ class Level0DataApi(object):
             obs_id = get_parameter(kwargs, "obs_id")
             detector_no = get_parameter(kwargs, "detector_no")
             obs_type = get_parameter(kwargs, "obs_type")
+            object_name = get_parameter(kwargs, "object_name")
             exp_time_start = get_parameter(kwargs, "obs_time", [None, None])[0]
             exp_time_end = get_parameter(kwargs, "obs_time", [None, None])[1]
             qc0_status = get_parameter(kwargs, "qc0_status")
@@ -53,6 +55,8 @@ class Level0DataApi(object):
                 sql_condition = f"{sql_condition} and detector_no='{detector_no}'"
             if obs_type:
                 sql_condition = f"{sql_condition} and obs_type='{obs_type}'"
+            if object_name:
+                sql_condition = f"{sql_condition} and object_name='{object_name}'"                
             if exp_time_start:
                 sql_condition = f"{sql_condition} and obs_time >='{exp_time_start}'"
             if exp_time_end:
@@ -200,6 +204,7 @@ class Level0DataApi(object):
             obs_id = get_parameter(kwargs, "obs_id"),
             detector_no = get_parameter(kwargs, "detector_no"),
             obs_type = get_parameter(kwargs, "obs_type"),
+            object_name = get_parameter(kwargs, "object_name"),
             obs_time = get_parameter(kwargs, "obs_time"),
             exp_time = get_parameter(kwargs, "exp_time"),
             detector_status_id = get_parameter(kwargs, "detector_status_id"),
@@ -217,9 +222,9 @@ class Level0DataApi(object):
                 return Result.error(message ='%s existed' %(rec.filename, ))
 
             self.db.execute(
-                'INSERT INTO ifs_level0_data (level0_id, obs_id, detector_no, obs_type, obs_time, exp_time,detector_status_id, filename, file_path,qc0_status, prc_status,create_time) \
-                    VALUES(?,?,?,?,?,?,?,?,?,?,?,?)',
-                (rec.level0_id, rec.obs_id, rec.detector_no, rec.obs_type, rec.obs_time, rec.exp_time, rec.detector_status_id, rec.filename, rec.file_path,-1,-1,format_time_ms(time.time()))
+                'INSERT INTO ifs_level0_data (level0_id, obs_id, detector_no, object_name, obs_type, obs_time, exp_time,detector_status_id, filename, file_path,qc0_status, prc_status,create_time) \
+                    VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)',
+                (rec.level0_id, rec.obs_id, rec.detector_no, rec.object_name, rec.obs_type, rec.obs_time, rec.exp_time, rec.detector_status_id, rec.filename, rec.file_path,-1,-1,format_time_ms(time.time()))
             )
             self.db.end()
             rec.id = self.db.last_row_id()
-- 
GitLab