From f9d7d05a6dadeac49f780a74ab709ecd98a94c9b Mon Sep 17 00:00:00 2001 From: mc36 Date: Wed, 8 Jan 2025 09:24:30 +0100 Subject: [PATCH] automatic commit at releng box --- src/org/freertr/user/userFilter.java | 37 ------------------- src/org/freertr/user/userFormat.java | 9 ----- src/org/freertr/user/userReader.java | 54 ++++++++++++++++++++++------ src/rtr.csv | 2 +- src/rtr.html | 2 +- src/rtr8.csv | 2 +- src/rtr8.html | 2 +- 7 files changed, 47 insertions(+), 61 deletions(-) diff --git a/src/org/freertr/user/userFilter.java b/src/org/freertr/user/userFilter.java index 0ca94dce33..8718cd0ae9 100644 --- a/src/org/freertr/user/userFilter.java +++ b/src/org/freertr/user/userFilter.java @@ -284,43 +284,6 @@ public static List section2text(List src, boolean rep) { return txt; } - /** - * convert sections to text - * - * @param sec section to convert - * @param sep format to use - * @return sectioned text - */ - public static List sectionDump(List sec, userFormat.tableMode sep) { - List txt = new ArrayList(); - for (int i = 0; i < sec.size(); i++) { - userFilter ntry = sec.get(i); - switch (sep) { - case normal: - txt.add(ntry.section + "|" + ntry.command + "|"); - break; - case csv: - txt.add(ntry.section + ";" + ntry.command); - break; - case html: - txt.add("" + ntry.section + "" + ntry.command + ""); - break; - case setdel: - String a = ntry.command.trim(); - String s = "set"; - if (a.startsWith(cmds.negated + cmds.tabulator)) { - s = "delete"; - a = a.substring(3, a.length()); - } - txt.add(s + " " + (ntry.section + " " + a).trim()); - break; - default: - break; - } - } - return txt; - } - /** * negate section * diff --git a/src/org/freertr/user/userFormat.java b/src/org/freertr/user/userFormat.java index ded243141a..6705e45b7e 100644 --- a/src/org/freertr/user/userFormat.java +++ b/src/org/freertr/user/userFormat.java @@ -41,10 +41,6 @@ public enum tableMode { * html mode */ html, - /** - * set/delete mode - */ - setdel } @@ -68,8 +64,6 @@ public static String tabmod2str(tableMode mod) { return "csv"; case html: return "html"; - case setdel: - return "setdel"; default: return "unknown"; } @@ -100,9 +94,6 @@ public static tableMode str2tabmod(String a) { if (a.equals("html")) { return tableMode.html; } - if (a.equals("setdel")) { - return tableMode.setdel; - } return null; } diff --git a/src/org/freertr/user/userReader.java b/src/org/freertr/user/userReader.java index 8a77d3df69..a30e73c283 100644 --- a/src/org/freertr/user/userReader.java +++ b/src/org/freertr/user/userReader.java @@ -512,7 +512,6 @@ private cmds doSummary(userFormat.tableMode tabMod, String a) { break; case html: case normal: - case setdel: break; } return new cmds("row", a); @@ -848,15 +847,6 @@ public List doFilterList(List lst) { userEditor edtr = new userEditor(new userScreen(pipe), lst, "result", false); edtr.doView(); return new ArrayList(); - case level: - lst = userFilter.sectionDump(userFilter.text2section(lst), userFormat.tableMode.normal); - return doSecond(lst); - case csv: - lst = userFilter.sectionDump(userFilter.text2section(lst), userFormat.tableMode.csv); - return doSecond(lst); - case html: - lst = userFilter.sectionDump(userFilter.text2section(lst), userFormat.tableMode.html); - return doSecond(lst); case xml: encXml xml = new encXml(); userFilter.section2xml(xml, "/config", userFilter.text2section(lst)); @@ -871,8 +861,50 @@ public List doFilterList(List lst) { case section: lst = userFilter.getSection(lst, filterS); return doSecond(lst); + case level: + List sec = userFilter.text2section(lst); + lst = new ArrayList(); + for (int i = 0; i < sec.size(); i++) { + userFilter ntry = sec.get(i); + lst.add(ntry.section + "|" + ntry.command + "|"); + } + return doSecond(lst); + case csv: + sec = userFilter.text2section(lst); + lst = new ArrayList(); + for (int i = 0; i < sec.size(); i++) { + userFilter ntry = sec.get(i); + lst.add(ntry.section + ";" + ntry.command); + } + return doSecond(lst); + case html: + sec = userFilter.text2section(lst); + lst = new ArrayList(); + for (int i = 0; i < sec.size(); i++) { + userFilter ntry = sec.get(i); + lst.add("" + ntry.section + "" + ntry.command + ""); + } + return doSecond(lst); case setdel: - lst = userFilter.sectionDump(userFilter.text2section(lst), userFormat.tableMode.setdel); + sec = userFilter.text2section(lst); + lst = new ArrayList(); + for (int i = 0; i < sec.size(); i++) { + userFilter ntry = sec.get(i); + a = ntry.command.trim(); + if (a.equals(cmds.finish)) { + continue; + } + if (a.equals(cmds.comment)) { + lst.add(cmds.comment); + continue; + } + String s = "set"; + if (a.startsWith(cmds.negated + cmds.tabulator)) { + s = "delete"; + a = a.substring(3, a.length()); + } + lst.add(s + " " + (ntry.section + " " + a).trim()); + } return doSecond(lst); default: return doSecond(lst); diff --git a/src/rtr.csv b/src/rtr.csv index eb35dbe901..70b5441572 100644 --- a/src/rtr.csv +++ b/src/rtr.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.8-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-08 07:21:28, took 00:14:39, with 50 workers, on 3604 cases, 0 failed, 0 traces, 0 retries +-;-;-;2025-01-08 07:56:57, took 00:15:10, with 50 workers, on 3604 cases, 0 failed, 0 traces, 1 retries -;-;-;./rtr.bin http://sources.freertr.org/cfg/basic01.tst;basic01.tst;success;dummy test http://sources.freertr.org/cfg/basic02.tst;basic02.tst;success;interface with slot diff --git a/src/rtr.html b/src/rtr.html index 5664192461..51da75c201 100644 --- a/src/rtr.html +++ b/src/rtr.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.8-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-08 07:21:28, took 00:14:39, with 50 workers, on 3604 cases, 0 failed, 0 traces, 0 retries
+tested: 2025-01-08 07:56:57, took 00:15:10, with 50 workers, on 3604 cases, 0 failed, 0 traces, 1 retries
jvm: ./rtr.bin

diff --git a/src/rtr8.csv b/src/rtr8.csv index 408d6baef2..bd1d72cc0c 100644 --- a/src/rtr8.csv +++ b/src/rtr8.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.8-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-08 07:31:36, took 00:09:45, with 50 workers, on 674 cases, 0 failed, 0 traces, 1 retries +-;-;-;2025-01-08 08:08:31, took 00:11:11, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries -;-;-;./rtr.bin http://sources.freertr.org/cfg/p4lang-acl001.tst;p4lang-acl001.tst;success;p4lang: copp http://sources.freertr.org/cfg/p4lang-acl002.tst;p4lang-acl002.tst;success;p4lang: ingress access list diff --git a/src/rtr8.html b/src/rtr8.html index 2e67b71e6a..84b85985dc 100644 --- a/src/rtr8.html +++ b/src/rtr8.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.8-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-08 07:31:36, took 00:09:45, with 50 workers, on 674 cases, 0 failed, 0 traces, 1 retries
+tested: 2025-01-08 08:08:31, took 00:11:11, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

fileresulttest
fileresulttest