[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner Scanner.java,1.20,1.21 ScannerFactory.java,1.7,1.8

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

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

Modified Files:
	Scanner.java ScannerFactory.java 
Log Message:
Fixing bug with s argument

Index: Scanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/Scanner.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Scanner.java	30 Jun 2003 22:16:42 -0000	1.20
--- Scanner.java	4 Aug 2003 12:46:06 -0000	1.21
***************
*** 98,101 ****
--- 98,102 ----
  
    public static final String SCANNER_FEEDER = "scanner";
+   public String scannerConfig;
  
    /**
***************
*** 126,131 ****
     * @param commandLine DOCUMENT ME!
     */
!   public void execute(CommandLine commandLine) {
      super.execute(commandLine);
  
      try {
--- 127,135 ----
     * @param commandLine DOCUMENT ME!
     */
!   public void execute(CommandLine commandLine) {    
      super.execute(commandLine);
+     if (commandLine.hasOption('s')) {
+     	scannerConfig = commandLine.getOptionValue('s');
+     }
  
      try {
***************
*** 167,173 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @return DOCUMENT ME!
     */
    public ScannerWorkerVO[] listWorkers() {
--- 171,177 ----
  
    /**
!    * List all workers in scanner
     *
!    * @return Array of scanner workers 
     */
    public ScannerWorkerVO[] listWorkers() {
***************
*** 209,213 ****
     */
    public void start() throws ScannerException {
!     factory = ScannerFactory.getInstance();
      log.logInfo("Starting feeder...");
  
--- 213,217 ----
     */
    public void start() throws ScannerException {
!     factory = ScannerFactory.getInstance(scannerConfig);
      log.logInfo("Starting feeder...");
  

Index: ScannerFactory.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ScannerFactory.java	30 Jun 2003 22:16:42 -0000	1.7
--- ScannerFactory.java	4 Aug 2003 12:46:06 -0000	1.8
***************
*** 123,126 ****
--- 123,129 ----
     */
    public static ScannerFactory getInstance(String scannerConfigName) {
+     if (scannerConfigName == null || scannerConfigName.equals("")) {
+     	scannerConfigName = DEFAULT_SCANNER_CONFIGURATION;
+     }
      ScannerFactory factory = (ScannerFactory) factories.get(scannerConfigName);