filter lines server-side

pdemanget · Oct 16, 2013 · eb50b77 · eb50b77
1 parent 4c73ce9
commit eb50b77
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 158 deletions.
diff --git a/src/main/java/fr/warlog/bus/FileMgt.java b/src/main/java/fr/warlog/bus/FileMgt.java
@@ -5,20 +5,13 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
-import java.nio.file.Watchable;
-import java.nio.file.WatchEvent.Kind;
-import java.nio.file.WatchEvent.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
-import java.util.Queue;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipInputStream;
 
@@ -28,7 +21,6 @@
 import fr.warlog.util.MainUtils;
 import fr.warlog.util.StandardException;
 import fr.warlog.util.Utils;
-import static java.nio.file.StandardWatchEventKinds.*;
 
 /**
  * File Management
@@ -151,27 +143,29 @@ public  String readFile( String pMsg ) {
  * @param col 
  * @param sep 
    */
-  public  Data<List<Line>>  readFileLines( String pMsg , int start, int limit, String sep, int col, String pattern) {
+  public  Data<List<Line>>  readFileLines( String pMsg , int start, int limit, String sep, int col, String spattern) {
     List<Line>  result = new ArrayList<Line>();
     Data<List<Line>> dataRes = new Data<List<Line>>(result);
       BufferedReader lBis = null;
       try {
           String line;
 
           if(pMsg.endsWith(".gz")){
-        	  GZIPInputStream zipIS = new GZIPInputStream( new FileInputStream( pMsg ));
+                @SuppressWarnings("resource")
+                GZIPInputStream zipIS = new GZIPInputStream( new FileInputStream(pMsg));
 //        	  ZipEntry nextEntry = zipIS.getNextEntry();
 			lBis = new BufferedReader( new InputStreamReader( zipIS, "UTF-8" ) );
     	  }else{
     		  lBis = new BufferedReader( new InputStreamReader( new FileInputStream( pMsg ), "UTF-8" ) );
     	  }
           boolean doProcess=true;
           int total=0;
+          Pattern pattern = (spattern == null)?null:Pattern.compile(spattern);
           while ( ( line = lBis.readLine() ) != null ) {
-              if(pattern !=null && !line.matches(pattern)){
-                  continue;
+              if(pattern !=null ){
+                  Matcher matcher = pattern.matcher(line);
+                  if(! matcher.find()) continue;
               }
-
               if(start>0){
                 start--;
               }else{

diff --git a/src/main/webapp/app/controller/FileController.js.antigitlost.js b/src/main/webapp/app/controller/FileController.js.antigitlost.js
diff --git a/src/main/webapp/app/view/file/List.js b/src/main/webapp/app/view/file/List.js
@@ -16,7 +16,7 @@ Ext.define('app.view.file.List' ,{
         displayInfo: true}],
 
     columns: [
-         {header: 'N°',  dataIndex: 'id',  width:50}
+         {header: 'line',  dataIndex: 'id',  width:50}
         ,{header: 'A',  dataIndex: 'col1',  flex: 1, renderer: 'htmlEncode'}
 //        ,{header: 'B', dataIndex: 'col2', flex: 1}
 //        ,{header: 'C', dataIndex: 'col3', flex: 1}