[Ngetsuite-cvs] ngetsuite/ngetsuite articles.rb,1.9,1.10 core.rb,1.39,1.40 group.rb,1.45,1.46

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

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

Modified Files:
	articles.rb core.rb group.rb 
Log Message:
misc fix, added multiple queue deletion at once


Index: articles.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/articles.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** articles.rb	23 May 2004 07:28:48 -0000	1.9
--- articles.rb	14 Jun 2004 05:31:28 -0000	1.10
***************
*** 141,145 ****
  		# or file n° 1/xx as all others
  		if rls = @@rls[cat]
! 			if (rls.poster==art._from) and (rls._nbexpected==total) and ((rls._rlsmap[cur-1].chr != '#') or (cur == 1 and rls._rlsmap =~ /^#_*$/))
  #NgetSuite::Utils.debug "#{cat}: part #{cur} already there {#{art._subject}}"
  				# another art for this release
--- 141,145 ----
  		# or file n° 1/xx as all others
  		if rls = @@rls[cat]
! 			if (rls.poster==art._from) and (rls._nbexpected==total) and (rls._rlsmap[cur-1] and ((rls._rlsmap[cur-1].chr != '#') or (cur == 1 and rls._rlsmap =~ /^#_*$/)))
  #NgetSuite::Utils.debug "#{cat}: part #{cur} already there {#{art._subject}}"
  				# another art for this release

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** group.rb	23 May 2004 07:28:48 -0000	1.45
--- group.rb	14 Jun 2004 05:31:28 -0000	1.46
***************
*** 126,130 ****
  	
  	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
--- 126,130 ----
  	
  	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 releases.time desc', @_groupindex, filter)
  		i = 0
  		subj, rlsmap, nbact, nbtot, time = nil

Index: core.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/core.rb,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** core.rb	21 May 2004 08:49:56 -0000	1.39
--- core.rb	14 Jun 2004 05:31:28 -0000	1.40
***************
*** 238,242 ****
  					queue_regexp(*args)
  				when 'delete-queue'
! 					Queue.delete(arg, true)
  				when 'show-queue'
  					args = arg.split(',')
--- 238,242 ----
  					queue_regexp(*args)
  				when 'delete-queue'
! 					arg.split(',').each{ |q| Queue.delete(q, true) }
  				when 'show-queue'
  					args = arg.split(',')