Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Suspect-Manager: new-suspects-filter

Browse source
This commit is contained in:
Arndt Brenschede 2018-08-18 10:46:16 +02:00
parent 195a39ed0c
commit 6799c0a171
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
brouter-server/src/main/java/btools/server/SuspectManager.java
View file

@ -43,12 +43,14 @@ public class SuspectManager extends Thread
public static void process( String url, BufferedWriter bw ) throws IOException public static void process( String url, BufferedWriter bw ) throws IOException
{ {
bw.write( "<html><body>\n" ); bw.write( "<html><body>\n" );
bw.write( "BRouter suspect manager. <a href=\"http://brouter.de/brouter/suspect_manager_help.html\">Help</a> " );
StringTokenizer tk = new StringTokenizer( url, "/" ); StringTokenizer tk = new StringTokenizer( url, "/" );
tk.nextToken(); tk.nextToken();
tk.nextToken(); tk.nextToken();
long id = 0L; long id = 0L;
String country = null; String country = null;
String filter = null;
if ( tk.hasMoreTokens() ) if ( tk.hasMoreTokens() )
{ {
@ -56,10 +58,16 @@ public class SuspectManager extends Thread
if ( new File( "suspects/suspects_" + ctry + ".txt" ).exists() ) if ( new File( "suspects/suspects_" + ctry + ".txt" ).exists() )
{ {
country = ctry; country = ctry;
if ( tk.hasMoreTokens() )
{
filter = tk.nextToken();
}
} }
} }
if ( country == null ) // generate country list if ( country == null ) // generate country list
{ {
bw.write( "<table>\n" );
File[] files = new File( "suspects" ).listFiles(); File[] files = new File( "suspects" ).listFiles();
TreeSet<String> names = new TreeSet<String>(); TreeSet<String> names = new TreeSet<String>();
for ( File f : files ) for ( File f : files )
@ -73,8 +81,9 @@ public class SuspectManager extends Thread
for ( String ctry : names ) for ( String ctry : names )
{ {
String url2 = "/brouter/suspects/" + ctry; String url2 = "/brouter/suspects/" + ctry;
bw.write( "<a href=\"" + url2 + "\">" + ctry + "</a><br>\n" ); bw.write( "<tr><td>" + ctry + "</td><td><a href=\"" + url2 + "/new\">new</a></td><td><a href=\"" + url2 + "/all\">all</a></td>\n" );
} }
bw.write( "</table>\n" );
bw.write( "</body></html>\n" ); bw.write( "</body></html>\n" );
bw.flush(); bw.flush();
return; return;
@ -109,7 +118,7 @@ public class SuspectManager extends Thread
break; break;
StringTokenizer tk2 = new StringTokenizer( line ); StringTokenizer tk2 = new StringTokenizer( line );
id = Long.parseLong( tk2.nextToken() ); id = Long.parseLong( tk2.nextToken() );
String countryId = country + "/" + id; String countryId = country + "/" + filter + "/" + id;
if ( new File( "falsepositives/" + id ).exists() ) if ( new File( "falsepositives/" + id ).exists() )
{ {
@ -150,7 +159,7 @@ public class SuspectManager extends Thread
int wps = NearRecentWps.count( id ); int wps = NearRecentWps.count( id );
if ( wps < 8 ) if ( wps < 8 )
{ {
message = "marking false-positive requires at least 10 recent nearby waypoints from BRouter-Web, found: " + wps; message = "marking false-positive requires at least 8 recent nearby waypoints from BRouter-Web, found: " + wps;
} }
else else
{ {
@ -178,7 +187,7 @@ public class SuspectManager extends Thread
} }
if ( id != 0L ) if ( id != 0L )
{ {
String countryId = country + "/" + id; String countryId = country + "/" + filter + "/" + id;
int ilon = (int) ( id >> 32 ); int ilon = (int) ( id >> 32 );
int ilat = (int) ( id & 0xffffffff ); int ilat = (int) ( id & 0xffffffff );
@ -217,7 +226,7 @@ public class SuspectManager extends Thread
File fixedEntry = new File( "fixedsuspects/" + id ); File fixedEntry = new File( "fixedsuspects/" + id );
if ( fixedEntry.exists() ) if ( fixedEntry.exists() )
{ {
bw.write( "<br><br><a href=\"/brouter/suspects/" + country + "/watchlist\">back to watchlist</a><br><br>\n" ); bw.write( "<br><br><a href=\"/brouter/suspects/" + country + "/" + filter + "/watchlist\">back to watchlist</a><br><br>\n" );
} }
else else
{ {
@ -231,14 +240,14 @@ public class SuspectManager extends Thread
{ {
bw.write( "<a href=\"/brouter/suspects/" + countryId + "/confirm\">mark as a confirmed issue</a><br><br>\n" ); bw.write( "<a href=\"/brouter/suspects/" + countryId + "/confirm\">mark as a confirmed issue</a><br><br>\n" );
} }
bw.write( "<br><br><a href=\"/brouter/suspects/" + country + "\">back to issue list</a><br><br>\n" ); bw.write( "<br><br><a href=\"/brouter/suspects/" + country + "/" + filter + "\">back to issue list</a><br><br>\n" );
} }
} }
else else
{ {
File suspects = new File( "suspects/suspects_" + country + ".txt" ); File suspects = new File( "suspects/suspects_" + country + ".txt" );
bw.write( "suspect list for " + country + "\n" ); bw.write( filter + " suspect list for " + country + "\n" );
bw.write( "<br><a href=\"/brouter/suspects/" + country + "/watchlist\">see watchlist</a>\n" ); bw.write( "<br><a href=\"/brouter/suspects/" + country + "/" + filter + "/watchlist\">see watchlist</a>\n" );
bw.write( "<br><a href=\"/brouter/suspects\">back to country list</a><br><br>\n" ); bw.write( "<br><a href=\"/brouter/suspects\">back to country list</a><br><br>\n" );
if ( suspects.exists() ) if ( suspects.exists() )
{ {
@ -258,9 +267,10 @@ public class SuspectManager extends Thread
break; break;
StringTokenizer tk2 = new StringTokenizer( line ); StringTokenizer tk2 = new StringTokenizer( line );
id = Long.parseLong( tk2.nextToken() ); id = Long.parseLong( tk2.nextToken() );
int prio = Integer.parseInt( tk2.nextToken() ); int prio = Integer.parseInt( tk2.nextToken() );
prio = ( ( prio + 1 ) / 2 ) * 2; // normalize (no link prios) prio = ( ( prio + 1 ) / 2 ) * 2; // normalize (no link prios)
String countryId = country + "/" + id; String countryId = country + "/" + filter + "/" + id;
String hint = ""; String hint = "";
@ -272,6 +282,10 @@ public class SuspectManager extends Thread
{ {
continue; // known fixed continue; // known fixed
} }
if ( "new".equals( filter ) && new File( "suspectarchive/" + id ).exists() )
{
continue; // known fixed
}
if ( pass == 1 ) if ( pass == 1 )
{ {
if ( prio > maxprio ) if ( prio > maxprio )