[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/worker FtpScanner.java,1.21,1.22

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

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

Modified Files:
	FtpScanner.java 
Log Message:
file_name should not contain path

Index: FtpScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/FtpScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FtpScanner.java	12 Sep 2003 01:09:17 -0000	1.21
--- FtpScanner.java	30 Sep 2003 14:36:37 -0000	1.22
***************
*** 309,313 ****
  			boolean success = ftpClient.retrieveFile(fileName, baos);
  			LogService.getInstance().logDebug("Retrieved file " + fileName);
! 
  			//if file was retrieved without errors feed it!
  			if (success) {
--- 309,313 ----
  			boolean success = ftpClient.retrieveFile(fileName, baos);
  			LogService.getInstance().logDebug("Retrieved file " + fileName);
! 			String scanFileName = fileName.substring(ftpClient.printWorkingDirectory().length()+1);
  			//if file was retrieved without errors feed it!
  			if (success) {
***************
*** 318,322 ****
  							SCAN_PATH_KEY,
  							"ftp://" + ftpHost + fileName),
! 						new NameValuePair("file_name", fileName),
  						new NameValuePair(
  							SCAN_MIMETYPE_KEY,
--- 318,322 ----
  							SCAN_PATH_KEY,
  							"ftp://" + ftpHost + fileName),
! 						new NameValuePair("file_name", scanFileName),
  						new NameValuePair(
  							SCAN_MIMETYPE_KEY,