[Ngetsuite-cvs] ngetsuite/ngetsuite downloader.rb,1.27,1.28 group.rb,1.41,1.42

[<jj...@us...>]

Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4596/ngetsuite

Modified Files:
	downloader.rb group.rb 
Log Message:
misc daemon fix, -G prints the date, reset fix for an empty base


Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** downloader.rb	5 Mar 2004 15:28:04 -0000	1.27
--- downloader.rb	14 Mar 2004 22:32:33 -0000	1.28
***************
*** 49,53 ****
  		line.chomp!
  		case line
! 		when /^(\d+) \((\d+)\/(\d+)\): (\d+)\/(\d+)L (\d+)\/(\d+)B (\d+)% (\d+)B\/s (\w+) (\d+)\/(\d+) (\w+)$/
  			part, size, speed, filenb = $2, $7, $9, $12
  			ldebug "#{green $5+'L'}(#{green $7+'B'}) at #{$9+'B/s'} [#{blue $2}/#{blue $3}] [#{yellow $11}/#{yellow $12}]", false
--- 49,53 ----
  		line.chomp!
  		case line
! 		when /^(\d+) \((\d+)\/(\d+)\): (\d+)\/(\d+)L (\d+)\/(\d+)B\s+(\d+)% (\d+)B\/s (\w+) (\d+)\/(\d+) (\w+)$/
  			part, size, speed, filenb = $2, $7, $9, $12
  			ldebug "#{green $5+'L'}(#{green $7+'B'}) at #{$9+'B/s'} [#{blue $2}/#{blue $3}] [#{yellow $11}/#{yellow $12}]", false
***************
*** 157,164 ****
  		when /^doarticle \d+: \d+!=\d+ \|\| \d+!=\d+$/
  		when /^unequal line count (\d+) should equal (\d+)$/
! 			ldebug "unequal line count (#{$1} != #{$2})"
  		when />> \d\d\d/, /<< (GROUP|AUTHINFO)/
  		
! 		when /^(?:OK:(.*))?(?:WARNINGS:(.*))?(?:ERRORS:(.*))?$/
  			return unless $1 or $2 or $3
  			ok,warn,errs = $1, $2, $3
--- 157,164 ----
  		when /^doarticle \d+: \d+!=\d+ \|\| \d+!=\d+$/
  		when /^unequal line count (\d+) should equal (\d+)$/
! 			ldebug "unequal line count (#{$1} != #{$2})", false
  		when />> \d\d\d/, /<< (GROUP|AUTHINFO)/
  		
! 		when /^(?:OK:(.*?))?(?:WARNINGS:(.*?))?(?:ERRORS:(.*?))?$/
  			return unless $1 or $2 or $3
  			ok,warn,errs = $1, $2, $3

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** group.rb	5 Mar 2004 15:28:04 -0000	1.41
--- group.rb	14 Mar 2004 22:32:33 -0000	1.42
***************
*** 118,127 ****
  	
  	def search_releases(filter)
! 		sth = Db.dbh.execute('select articles.subject,releases.rlsmap,releases.nbactual,releases.nbexpected from releases,articles where articles.artindex = releases.artindex and articles.groupindex = ? and articles.subject RLIKE ? order by articles.time desc', @_groupindex, filter)
  		i = 0
! 		subj, rlsmap, nbact, nbtot = nil
  		sth.fetch do |row|
! 			subj, rlsmap, nbact, nbtot = *row
! 			puts "#{yellow nbact}/#{yellow nbtot} [#{green rlsmap}] \"#{subj}\""
  			i += 1
  		end
--- 118,127 ----
  	
  	def search_releases(filter)
! 		sth = Db.dbh.execute('select articles.subject,releases.rlsmap,releases.nbactual,releases.nbexpected,releases.time from releases,articles where articles.artindex = releases.artindex and articles.groupindex = ? and articles.subject RLIKE ? order by articles.time desc', @_groupindex, filter)
  		i = 0
! 		subj, rlsmap, nbact, nbtot, time = nil
  		sth.fetch do |row|
! 			subj, rlsmap, nbact, nbtot, time = *row
! 			puts "#{time} #{yellow nbact}/#{yellow nbtot} [#{green rlsmap}] \"#{subj}\""
  			i += 1
  		end