Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Turris
Foris
foris-pakon-plugin
Commits
f55c53a3
Verified
Commit
f55c53a3
authored
Nov 28, 2018
by
Michal Hrusecky
🐭
Browse files
Fix aggregation
parent
bb621a40
Changes
1
Hide whitespace changes
Inline
Side-by-side
foris_plugins/pakon/static/js/data_manager.js
View file @
f55c53a3
...
...
@@ -205,7 +205,7 @@ function aggregate_data() {
let
i
;
let
proto
=
""
aggregated_data
=
[];
for
(
i
=
1
;
i
<
tmp
.
length
;
i
++
)
{
for
(
i
=
0
;
i
<
tmp
.
length
;
i
++
)
{
cur_entry
=
tmp
[
i
];
if
(
cur_entry
[
2
]
==
last_entry
[
2
]
&&
cur_entry
[
3
]
==
last_entry
[
3
])
{
if
(
proto
!=
cur_entry
[
4
])
...
...
@@ -233,6 +233,12 @@ function aggregate_data() {
}
last_entry
=
cur_entry
;
}
if
(
a_entries
.
length
<
2
)
{
if
(
a_entries
.
length
==
1
)
aggregated_data
.
push
(
a_entries
[
0
]);
}
else
{
aggregated_data
.
push
([
print_date
(
st_date
),
(
nd_date
.
getTime
()
-
st_date
.
getTime
())
/
1000
,
last_entry
[
2
],
last_entry
[
3
],
proto
,
''
,
send
,
recv
,
a_entries
]);
}
console
.
log
(
'
Aggregated
'
+
tmp
.
length
+
'
->
'
+
aggregated_data
.
length
);
sort_data
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment