[Ngetsuite-cvs] ngetsuite/ngetsuite db.rb,1.18,1.19 downloader.rb,1.14,1.15 downloadmanager.rb,1.10,1.11 queue_file.rb,1.12,1.13

[<bla...@us...>]

Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite
In directory sc8-pr-cvs1:/tmp/cvs-serv13933/ngetsuite

Modified Files:
	db.rb downloader.rb downloadmanager.rb queue_file.rb 
Log Message:
some bugfixes

Index: db.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/db.rb,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** db.rb	27 Dec 2003 18:13:36 -0000	1.18
--- db.rb	27 Dec 2003 20:01:54 -0000	1.19
***************
*** 229,233 ****
  
  	def ids_constraint
! 		ids(self.class).each{ |id|
  			f = fields(self.class)[id]
  			value = f.todb(method('_'+id)).call
--- 229,233 ----
  
  	def ids_constraint
! 		ids(self.class).map{ |id|
  			f = fields(self.class)[id]
  			value = f.todb(method('_'+id)).call

Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** downloader.rb	27 Dec 2003 18:13:36 -0000	1.14
--- downloader.rb	27 Dec 2003 20:01:54 -0000	1.15
***************
*** 1,4 ****
--- 1,5 ----
  require 'ngetsuite/queue_file'
  require 'ngetsuite/utils'
+ require 'ftools'
  
  module NgetSuite
***************
*** 84,87 ****
--- 85,89 ----
  		@start_time = Time.new
  		@status = 'PROCESSING'
+ 		puts "before locking"
  		$dbh.do 'lock tables queue write'
  		$dbh.do "update queue set `status` = 'PROCESSING', `date_started`= NOW()  where `id` = '#{@id}'"

Index: downloadmanager.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** downloadmanager.rb	2 Nov 2003 19:14:29 -0000	1.10
--- downloadmanager.rb	27 Dec 2003 20:01:54 -0000	1.11
***************
*** 27,37 ****
  			@started = true
  			@mainThread = Thread.new {
! 				loop do
! 					log "current : #{@current_dlers}, max : #{@max_dlers}"
! 					if (@current_dlers < @max_dlers)
! 						start_new_downloader
  					end
! 					check_finished_dls
! 					sleep(@poll_interval)
  				end
  			}
--- 27,50 ----
  			@started = true
  			@mainThread = Thread.new {
! 				begin
! 					loop do
! 						log "current : #{@current_dlers}, max : #{@max_dlers}"
! 						if (@current_dlers < @max_dlers)
! 							start_new_downloader
! 						end
! 						check_finished_dls
! 						sleep(@poll_interval)
  					end
! 				rescue rescueException => e
! 					puts "Exception : " + e
! 					puts " => " + e.message
! 					print e.backtrace.join("\n")
! 				rescue Error => e
! 					puts "Error : " + e
! 					print e.backtrace.join("\n")
! 				rescue DBI::DatabaseError => e
! 					puts 'An error occurred'
! 					puts 'Error code: ' + e.err
! 					puts 'Error message: ' + e.errstr
  				end
  			}

Index: queue_file.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue_file.rb,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** queue_file.rb	27 Dec 2003 18:13:36 -0000	1.12
--- queue_file.rb	27 Dec 2003 20:01:54 -0000	1.13
***************
*** 58,62 ****
  		@_filename = 'not found' if (@_filename == nil)
  
! 		@_date_finished = format_date(Time.now)
  
  		if res
--- 58,62 ----
  		@_filename = 'not found' if (@_filename == nil)
  
! 		@_date_finished = Time.now
  
  		if res