rname to record_name and rtype to record_type

jacomago · jacomago · commit fdd3ed8e3b46 · 2025-03-12T10:45:51.000+01:00
diff --git a/server/recceiver/cfstore.py b/server/recceiver/cfstore.py
@@ -108,9 +108,7 @@ def _startServiceWithLock(self):
                     required_properties.add("pvaPort")
                 infotags_whitelist = self.conf.get("infotags", list())
                 if infotags_whitelist:
-                    record_property_names_list = [
-                        s.strip(", ") for s in infotags_whitelist.split()
-                    ]
+                    record_property_names_list = [s.strip(", ") for s in infotags_whitelist.split()]
                 else:
                     record_property_names_list = []
                 if self.conf.get("recordDesc"):
@@ -126,11 +124,7 @@ def _startServiceWithLock(self):
                     self.client.set(property={"name": cf_property, "owner": owner})
 
                 self.record_property_names_list = set(record_property_names_list)
-                _log.debug(
-                    "record_property_names_list = {}".format(
-                        self.record_property_names_list
-                    )
-                )
+                _log.debug("record_property_names_list = {}".format(self.record_property_names_list))
             except ConnectionError:
                 _log.exception("Cannot connect to Channelfinder service")
                 raise
@@ -220,10 +214,10 @@ def _commitWithThread(self, transaction):
         iocid = host + ":" + str(port)
 
         recordInfo = {}
-        for record_id, (rname, rtype) in transaction.records_to_add.items():
-            recordInfo[record_id] = {"pvName": rname}
+        for record_id, (record_name, record_type) in transaction.records_to_add.items():
+            recordInfo[record_id] = {"pvName": record_name}
             if self.conf.get("recordType"):
-                recordInfo[record_id]["recordType"] = rtype
+                recordInfo[record_id]["recordType"] = record_type
         for record_id, (record_infos_to_add) in transaction.record_infos_to_add.items():
             # find intersection of these sets
             if record_id not in recordInfo:
@@ -233,11 +227,7 @@ def _commitWithThread(self, transaction):
                     )
                 )
                 continue
-            recinfo_wl = [
-                p
-                for p in self.record_property_names_list
-                if p in record_infos_to_add.keys()
-            ]
+            recinfo_wl = [p for p in self.record_property_names_list if p in record_infos_to_add.keys()]
             if recinfo_wl:
                 recordInfo[record_id]["infoProperties"] = list()
                 for infotag in recinfo_wl:
@@ -290,6 +280,7 @@ def _commitWithThread(self, transaction):
                 continue
             recordInfoByName[info["pvName"]] = info
             _log.debug("Add record: {record_id}: {info}".format(record_id=record_id, info=info))
+            _log.debug("Add record: {record_id}: {info}".format(record_id=record_id, info=info))
 
         if transaction.initial:
             """Add IOC to source list """
diff --git a/server/recceiver/dbstore.py b/server/recceiver/dbstore.py
@@ -138,26 +138,26 @@ def _commit(self, cur, transaction):
 
         # Start new records
         cur.executemany(
-            "INSERT INTO %s (host, id, rtype) VALUES (?,?,?)" % self.trecord,
-            [(srvid, recid, rtype) for recid, (rname, rtype) in transaction.records_to_add.items()],
+            "INSERT INTO %s (host, id, record_type) VALUES (?,?,?)" % self.trecord,
+            [(srvid, recid, record_type) for recid, (record_name, record_type) in transaction.records_to_add.items()],
         )
 
         # Add primary record names
         cur.executemany(
-            """INSERT INTO %s (rec, rname, prim) VALUES (
+            """INSERT INTO %s (rec, record_name, prim) VALUES (
                          (SELECT pkey FROM %s WHERE id=? AND host=?)
                          ,?,1)"""
             % (self.tname, self.trecord),
-            [(recid, srvid, rname) for recid, (rname, rtype) in transaction.records_to_add.items()],
+            [(recid, srvid, record_name) for recid, (record_name, record_type) in transaction.records_to_add.items()],
         )
 
         # Add new record aliases
         cur.executemany(
-            """INSERT INTO %(name)s (rec, rname, prim) VALUES (
+            """INSERT INTO %(name)s (rec, record_name, prim) VALUES (
                          (SELECT pkey FROM %(rec)s WHERE id=? AND host=?)
                          ,?,0)"""
             % {"name": self.tname, "rec": self.trecord},
-            [(recid, srvid, rname) for recid, names in transaction.aliases.items() for rname in names],
+            [(recid, srvid, record_name) for recid, names in transaction.aliases.items() for record_name in names],
         )
 
         # add record client_infos
diff --git a/server/recceiver/processors.py b/server/recceiver/processors.py
@@ -163,8 +163,10 @@ def _commit(self, trans):
             _log.info("#  connection lost")
         for item in trans.client_infos.items():
             _log.info(" epicsEnvSet('{name}','{value}')".format(name=item[0], value=item[1]))
-        for record_id, (rname, rtype) in trans.records_to_add.items():
-            _log.info(' record({rtype}, "{rname}") {{'.format(rtype=rtype, rname=rname))
+        for record_id, (record_name, record_type) in trans.records_to_add.items():
+            _log.info(
+                ' record({record_type}, "{record_name}") {{'.format(record_type=record_type, record_name=record_name)
+            )
             for alias in trans.aliases.get(record_id, []):
                 _log.info('  alias("{alias}")'.format(alias=alias))
             for item in trans.record_infos_to_add.get(record_id, {}).items():
diff --git a/server/recceiver/recast.py b/server/recceiver/recast.py
@@ -161,18 +161,18 @@ def recvInfo(self, body):
 
     # 0x0003
     def recvAddRec(self, body):
-        record_id, rtype, rtlen, rnlen = _c_rec.unpack(body[: _c_rec.size])
+        record_id, record_type, rtlen, rnlen = _c_rec.unpack(body[: _c_rec.size])
         text = body[_c_rec.size :]
         text = text.decode()
         if rnlen == 0 or rtlen + rnlen < len(text):
             _log.error("Ignoring record update")
 
-        elif rtlen > 0 and rtype == 0:  # new record
+        elif rtlen > 0 and record_type == 0:  # new record
             rectype = text[:rtlen]
             recname = text[rtlen : rtlen + rnlen]
             self.sess.addRecord(record_id, rectype, recname)
 
-        elif rtype == 1:  # record alias
+        elif record_type == 1:  # record alias
             recname = text[rtlen : rtlen + rnlen]
             self.sess.addAlias(record_id, recname)
 
@@ -322,13 +322,13 @@ def iocInfo(self, key, val):
         self.transaction.client_infos[key] = val
         self.markDirty()
 
-    def addRecord(self, record_id, rtype, rname):
+    def addRecord(self, record_id, record_type, record_name):
         self.flushSafely()
-        self.transaction.records_to_add[record_id] = (rname, rtype)
+        self.transaction.records_to_add[record_id] = (record_name, record_type)
         self.markDirty()
 
-    def addAlias(self, record_id, rname):
-        self.transaction.aliases[record_id].append(rname)
+    def addAlias(self, record_id, record_name):
+        self.transaction.aliases[record_id].append(record_name)
         self.markDirty()
 
     def delRecord(self, record_id):
