From 92fb7aa7ca8e162fc4fd773e687f25f43dfbf758 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Fri, 15 Nov 2024 18:08:08 +0100
Subject: [PATCH] convert types only before writing DB

---
 SATES20-CPCL-DYNA/cfg/python/data.py |  9 +++++++++
 SATES20-CPCL-DYNA/cfg/python/pvs.py  | 10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/SATES20-CPCL-DYNA/cfg/python/data.py b/SATES20-CPCL-DYNA/cfg/python/data.py
index 977a5d2..96f1c02 100644
--- a/SATES20-CPCL-DYNA/cfg/python/data.py
+++ b/SATES20-CPCL-DYNA/cfg/python/data.py
@@ -1,6 +1,14 @@
 import json
 
 
+DTYPES = {
+    "float": "ai",
+    "int": "longin",
+    "bool": "bi",
+    "str": "stringin"
+}
+
+
 def load_data(fn):
     try:
         with open(fn) as f:
@@ -16,6 +24,7 @@ def save_data(data, fn):
 def mk_db(data, fn):
     with open(fn, "w") as f:
         for name, dtyp in data.items():
+            dtyp = DTYPES[dtyp]
             entry = f'record({dtyp}, "$(SYSTEM):{name}") {{}}'
             f.write(entry)
             f.write("\n")
diff --git a/SATES20-CPCL-DYNA/cfg/python/pvs.py b/SATES20-CPCL-DYNA/cfg/python/pvs.py
index 041b831..eb02152 100644
--- a/SATES20-CPCL-DYNA/cfg/python/pvs.py
+++ b/SATES20-CPCL-DYNA/cfg/python/pvs.py
@@ -5,14 +5,6 @@ from log import log
 from utils import toggle
 
 
-DTYPES = {
-    "float": "ai",
-    "int": "longin",
-    "bool": "bi",
-    "str": "stringin"
-}
-
-
 FN_ENTRIES = "/ioc/data/SATES20-CPCL-DYNA/entries"
 FN_DB_TMPL = "/ioc/data/SATES20-CPCL-DYNA/dynamic.template"
 
@@ -30,7 +22,6 @@ def cb_add(value=None, **kwargs):
         log.info(f"add: ignoring name={repr(name)}")
         return
     dtyp = pv_dtyp.get(as_string=True)
-    dtyp = DTYPES[dtyp]
     log.info(f"add: name={repr(name)} type={repr(dtyp)} {kwargs}")
     data = load_data(FN_ENTRIES)
     data[name] = dtyp
@@ -62,7 +53,6 @@ pv_remove = PV("SATES20-DYNA:REMOVE")
 pv_remove.add_callback(cb_remove)
 
 
-
 def mk_printable_data(data):
     return "\n".join(f"{k} ({v})" for k, v in sorted(data.items()))