1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
Origin: https://github.com/L1L1/cardpeek/pull/110
From: =?UTF-8?q?David=20Santamar=C3=ADa=20Rogado?= <howl.nsp@gmail.com>
Date: Sat, 8 Feb 2020 22:05:21 +0100
Subject: tachograph.lua: Preserve with Lua 5.3 the same output as with 5.2
Just convert to integers some output values to avoid .0 appearing in the output.
Signed-off-by: David Santamara Rogado <howl.nsp@gmail.com>
---
dot_cardpeek_dir/scripts/tachograph.lua | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dot_cardpeek_dir/scripts/tachograph.lua b/dot_cardpeek_dir/scripts/tachograph.lua
index 77663d4..4df1535 100644
--- a/dot_cardpeek_dir/scripts/tachograph.lua
+++ b/dot_cardpeek_dir/scripts/tachograph.lua
@@ -105,7 +105,7 @@ function Count_NoOfEventsPerType()
end
function Count_ActivityStructureLength()
- return activityStructureLength
+ return math.tointeger(activityStructureLength)
end
function Count_NoOfCardVehicleRecords()
@@ -306,7 +306,7 @@ function Tacho_DATEF(data,node)
end
function Tacho_NUMERIC(data,node)
- node:set_attribute("alt",data:tonumber())
+ node:set_attribute("alt",math.tointeger(data:tonumber()))
end
function Tacho_REGION_NUMERIC(data,node)
@@ -413,15 +413,15 @@ function Tacho_ACTIVITY_RECORDS(data,node)
local cat_cur = 0
local rec_date = os.date("!%d/%m/%Y", subpart(data,ptr+4,ptr+7):tonumber())
- subnode = node:append({classname='record',label='CardActivityDailyRecord', size=rec_len, id=counter})
+ subnode = node:append({classname='record',label='CardActivityDailyRecord', size=math.tointeger(rec_len), id=counter})
subnode:append({classname='item',
label='activityRecordLength',
val=subpart(data,ptr+2,ptr+3),
- alt=string.format("%d (address:%s)",rec_len,ptr)})
+ alt=string.format("%d (address:%s)",rec_len,math.tointeger(ptr))})
subnode:append({classname='item',
label='activityPreviousRecordLength',
val=subpart(data,ptr,ptr+1),
- alt=subpart(data,ptr,ptr+1):tonumber()})
+ alt=math.tointeger(subpart(data,ptr,ptr+1):tonumber())})
subnode:append({classname='item',
label='activityRecordDate',
val=subpart(data,ptr+4,ptr+7),
@@ -429,14 +429,14 @@ function Tacho_ACTIVITY_RECORDS(data,node)
subnode:append({classname='item',
label='dailyPresenceCounter',
val=subpart(data,ptr+8,ptr+9),
- alt=subpart(data,ptr+8,ptr+9):tonumber() })
+ alt=math.tointeger(subpart(data,ptr+8,ptr+9):tonumber()) })
subnode:append({classname='item',
label='activityDayDistance',
val=subpart(data,ptr+10,ptr+11),
- alt=subpart(data,ptr+10,ptr+11):tonumber() .. " km"})
+ alt=math.tointeger(subpart(data,ptr+10,ptr+11):tonumber()) .. " km"})
subsub_node = subnode:append({classname='record',
label='activityChangeInfo',
- size=#activity,
+ size=math.tointeger(#activity),
val=activity})
if #activity>0 then
|
