fix
This commit is contained in:
@@ -17,27 +17,6 @@ async def get_data(cfg: object, id: int, pool) -> tuple:
|
|||||||
return unit_name, tool_name, tool_data
|
return unit_name, tool_name, tool_data
|
||||||
|
|
||||||
async def make_pipe_sep_matrix(cfg: object, id: int, pool) -> list:
|
async def make_pipe_sep_matrix(cfg: object, id: int, pool) -> list:
|
||||||
"""
|
|
||||||
Processes raw tool data and transforms it into a matrix format for database insertion.
|
|
||||||
|
|
||||||
This function retrieves raw tool data using `get_data`, splits it into individual
|
|
||||||
readings (rows), and further parses each reading into individual values. It
|
|
||||||
handles data where multiple nodes might be reporting values within a single
|
|
||||||
reading. The resulting matrix is a list of lists, where each inner list
|
|
||||||
represents a row of data ready for insertion into the database. Missing
|
|
||||||
values are padded with `None` to ensure consistent row length.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
cfg: A configuration object containing database connection parameters
|
|
||||||
and table names.
|
|
||||||
id: The ID of the tool record to process.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
A list of lists (matrix) representing the processed data. Each inner list
|
|
||||||
contains the following elements: UnitName, ToolNameID, NodeNum, EventDate,
|
|
||||||
EventTime, BatLevel, Temperature, followed by up to 16 additional
|
|
||||||
measurement values (Val0 to ValF), padded with None if necessary.
|
|
||||||
"""
|
|
||||||
UnitName, ToolNameID, ToolData = await get_data(cfg, id, pool)
|
UnitName, ToolNameID, ToolData = await get_data(cfg, id, pool)
|
||||||
righe = ToolData.splitlines()
|
righe = ToolData.splitlines()
|
||||||
matrice_valori = []
|
matrice_valori = []
|
||||||
@@ -60,27 +39,6 @@ async def make_pipe_sep_matrix(cfg: object, id: int, pool) -> list:
|
|||||||
return matrice_valori
|
return matrice_valori
|
||||||
|
|
||||||
async def make_ain_din_matrix(cfg: object, id: int, pool) -> list:
|
async def make_ain_din_matrix(cfg: object, id: int, pool) -> list:
|
||||||
"""
|
|
||||||
Processes raw location (LOC) tool data and transforms it into a matrix format for database insertion.
|
|
||||||
|
|
||||||
This function retrieves raw LOC tool data using `get_data`, splits it into
|
|
||||||
individual readings (rows), and parses each reading into individual values
|
|
||||||
specific to the LOC data format (timestamp, battery level, temperature, and
|
|
||||||
four additional values: ain1, ain2, din1, din2). The resulting matrix is a list
|
|
||||||
of lists, where each inner list represents a row of data ready for insertion
|
|
||||||
into the database. Missing values are padded with `None` to ensure consistent
|
|
||||||
row length. It uses a regular expression to filter lines that match the
|
|
||||||
expected LOC data format.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
cfg: A configuration object containing database connection parameters
|
|
||||||
and table names.
|
|
||||||
id: The ID of the tool record to process.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
A list of lists (matrix) representing the processed LOC data. Each inner
|
|
||||||
list contains data fields similar to `make_matrix`, adjusted for LOC data.
|
|
||||||
"""
|
|
||||||
UnitName, ToolNameID, ToolData = await get_data(cfg, id, pool)
|
UnitName, ToolNameID, ToolData = await get_data(cfg, id, pool)
|
||||||
node_channels, node_types, node_ains, node_dins = get_nodes_type(cfg, ToolNameID, UnitName)
|
node_channels, node_types, node_ains, node_dins = get_nodes_type(cfg, ToolNameID, UnitName)
|
||||||
righe = ToolData.splitlines()
|
righe = ToolData.splitlines()
|
||||||
|
|||||||
Reference in New Issue
Block a user