[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner ScannerWorker.java,1.27,1.28

[<de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner
In directory sc8-pr-cvs1:/tmp/cvs-serv18133/modules/scanner/src/com/babeldoc/scanner

Modified Files:
	ScannerWorker.java 
Log Message:
acceptEntry and addFilter methods are copied & pasted from 1.0 branch.
This should be tested! 

Index: ScannerWorker.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerWorker.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ScannerWorker.java	30 Sep 2003 14:37:21 -0000	1.27
--- ScannerWorker.java	9 Oct 2003 06:54:10 -0000	1.28
***************
*** 66,73 ****
--- 66,77 ----
  package com.babeldoc.scanner;
  
+ import java.util.Hashtable;
  import java.util.Map;
  import java.util.HashMap;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
  
  import com.babeldoc.core.GeneralException;
+ import com.babeldoc.core.I18n;
  import com.babeldoc.core.LogService;
  import com.babeldoc.core.Named;
***************
*** 222,237 ****
     * @return true if accepted - false otherwise
     */
!   public boolean acceptEntry(String filter, String string) {
!     return true;
    }
  
!   /**
!    * Add a filter
!    *
!    * @param filter to be added
!    */
!   public void addFilter(String filter) {
!     //TODO: Implement this
    }
  
    /**
--- 226,265 ----
     * @return true if accepted - false otherwise
     */
!   private Hashtable patterns = new Hashtable();
!   protected void addFilter(String filterName) {
! 	  String patternExp = (String) this.getInfo().getOption(filterName).getValue();
! 	  if ((patternExp==null) || patternExp.equals("")) {
! 		  patternExp = ".*"; //match all
! 	  }
! 	  Pattern pattern = Pattern.compile(patternExp);
! 	  if (LogService.getInstance().isDebugEnabled()) {
! 		  LogService.getInstance().logDebug(
! 			  I18n.get(
! 					  "scanner.ScannerWorker.debug.addingFilter",
! 					  patternExp,
! 					  filterName));
! 		  }
! 	  patterns.put(filterName, pattern);
    }
  
!   protected boolean acceptEntry(String patternName, String text) {
! 	  Pattern pattern = (Pattern) patterns.get(patternName);
! 	  if (pattern == null) {
! 		  LogService.getInstance().logDebug(
! 			  I18n.get("scanner.ScannerWorker.warn.noFilter", patternName));
! 		  return false;
! 	  }
! 	  Matcher matcher = pattern.matcher(text);
! 	  boolean result = matcher.matches();
! 	  if (LogService.getInstance().isDebugEnabled()) {
! 		  LogService.getInstance().logDebug(
! 			  I18n.get(
! 				  "scanner.ScannerWorker.debug.match",
! 				  Boolean.toString(result),
! 				  text));
! 	  }
! 	  return result;
    }
+ 
  
    /**