changed fixedsuspect expiry

brouter-server/src/main/java/btools/server/SuspectManager.java

@@ -101,6 +101,15 @@ public class SuspectManager extends Thread
       return;
     }
 
+    File suspectFile = new File( "suspects/suspects_" + country + ".txt" );
+    if ( suspectFile.exists() )
+    {
+      bw.write( "suspect file for country '" + country + "' not found\n" );
+      bw.write( "</body></html>\n" );
+      bw.flush();
+      return;
+    }
+
     boolean showWatchList = false;
     if ( tk.hasMoreTokens() )
     {
@@ -117,12 +126,9 @@ public class SuspectManager extends Thread
 
     if ( showWatchList )
     {
-      File suspects = new File( "suspects/suspects_" + country + ".txt" );
       bw.write( "watchlist for " + country + "\n" );
       bw.write( "<br><a href=\"/brouter/suspects\">back to country list</a><br><br>\n" );
-      if ( suspects.exists() )
+      BufferedReader r = new BufferedReader( new FileReader( suspectFile ) );
-      {
-        BufferedReader r = new BufferedReader( new FileReader( suspects ) );
       for ( ;; )
       {
         String line = r.readLine();
@@ -136,9 +142,8 @@ public class SuspectManager extends Thread
         {
           continue; // known false positive
         }
-          File fixedEntry = new File( "fixedsuspects/" + id );
         File confirmedEntry = new File( "confirmednegatives/" + id );
-          if ( !( fixedEntry.exists() && confirmedEntry.exists() ) )
+        if ( !( isFixed( id, suspectFile ) && confirmedEntry.exists() ) )
         {
           continue;
         }
@@ -156,7 +161,6 @@ public class SuspectManager extends Thread
         bw.write( "<a href=\"" + url2 + "\">" + dlon + "," + dlat + "</a>" + hint + "<br>\n" );
       }
       r.close();
-      }
       bw.write( "</body></html>\n" );
       bw.flush();
       return;
@@ -194,15 +198,20 @@ public class SuspectManager extends Thread
       if ( "fixed".equals( command ) )
       {
         File fixedMarker = new File( "fixedsuspects/" + id );
+        if ( !fixedMarker.exists() )
+        {
           fixedMarker.createNewFile();
+        }
         id = 0L;
 
+        int hideDays = 0;
         if ( tk.hasMoreTokens() )
         {
           String param = tk.nextToken();
-          int hideDays = Integer.parseInt( param );
+          hideDays = Integer.parseInt( param );
           fixedMarker.setLastModified( System.currentTimeMillis() + hideDays*86400000L );
         }
+        fixedMarker.setLastModified( System.currentTimeMillis() + hideDays*86400000L );
       }
     }
     if ( id != 0L )
@@ -252,8 +261,7 @@ public class SuspectManager extends Thread
       bw.write( "<a href=\"" + url4 + "\">Open in Overpass / minus one week</a><br><br>\n" );
       bw.write( "<a href=\"" + url5 + "\">Open in Who-Did-It / last week</a><br><br>\n" );
       bw.write( "<br>\n" );
-      File fixedEntry = new File( "fixedsuspects/" + id );
+      if ( isFixed( id, suspectFile ) )
-      if ( fixedEntry.exists() )
       {
         bw.write( "<br><br><a href=\"/brouter/suspects/" + country + "/" + filter + "/watchlist\">back to watchlist</a><br><br>\n" );
       }
@@ -281,12 +289,9 @@ public class SuspectManager extends Thread
     }
     else
     {
-      File suspects = new File( "suspects/suspects_" + country + ".txt" );
       bw.write( filter + " suspect list for " + country + "\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" );
-      if ( suspects.exists() )
-      {
       int maxprio = 0;
       for ( int pass = 1; pass <= 2; pass++ )
       {
@@ -295,7 +300,7 @@ public class SuspectManager extends Thread
           bw.write( "current level: " + getLevelDecsription( maxprio ) + "<br><br>\n" );
         }
 
-          BufferedReader r = new BufferedReader( new FileReader( suspects ) );
+        BufferedReader r = new BufferedReader( new FileReader( suspectFile ) );
         for ( ;; )
         {
           String line = r.readLine();
@@ -314,7 +319,7 @@ public class SuspectManager extends Thread
           {
             continue; // known false positive
           }
-            if ( new File( "fixedsuspects/" + id ).exists() )
+          if ( isFixed( id, suspectFile ) )
           {
             continue; // known fixed
           }
@@ -348,10 +353,16 @@ public class SuspectManager extends Thread
         r.close();
       }
     }
-    }
     bw.write( "</body></html>\n" );
     bw.flush();
     return;
   }
   
+
+  private static boolean isFixed( long id, File suspectFile )
+  {
+    File fixedEntry = new File( "fixedsuspects/" + id );
+    return fixedEntry.exists() && fixedEntry.lastModified() > suspectFile.lastModified();
+  }
+  
 }