[Ngetsuite-cvs] ngetsuite resetdb.rb,1.4,1.5

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

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

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


Index: resetdb.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/resetdb.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** resetdb.rb	27 Feb 2004 13:12:06 -0000	1.4
--- resetdb.rb	14 Mar 2004 22:32:33 -0000	1.5
***************
*** 6,12 ****
  require 'ngetsuite/db'
  
! savedgroups = Db.dbh.select_all('select `fullname`,`shortname`,`directory`,`active`,`date_added`,`description` from `groups` order by `groupindex`')
! savedqueues = Db.dbh.select_all('select * from `queue`')
! puts "Queues (to restore manually)" + savedqueues.map{ |q| "\n"+q.map{|e| e.to_s }.join(', ') }.join
  
  sqlfile = File.open('ngetcache.sql')
--- 6,17 ----
  require 'ngetsuite/db'
  
! backupped = true
! begin
! 	savedgroups = Db.dbh.select_all('select `fullname`,`shortname`,`directory`,`active`,`date_added`,`description` from `groups` order by `groupindex`')
! 	savedqueues = Db.dbh.select_all('select * from `queue`')
! 	puts "Queues (to restore manually)" + savedqueues.map{ |q| "\n"+q.map{|e| e.to_s }.join(', ') }.join
! rescue Object
! 	backupped = false
! end
  
  sqlfile = File.open('ngetcache.sql')
***************
*** 25,33 ****
  }	
  
! puts 'Restoring groups...'
! sth = Db.dbh.prepare "insert into `groups` (`fullname`,`shortname`,`directory`,`active`,`date_added`,`description`) values (?,?,?,?,?,?)"
! savedgroups.each { |g|
! 	sth.execute(*g)
! }
  
  Db.dbh.disconnect
--- 30,40 ----
  }	
  
! if backupped
! 	puts 'Restoring groups...'
! 	sth = Db.dbh.prepare "insert into `groups` (`fullname`,`shortname`,`directory`,`active`,`date_added`,`description`) values (?,?,?,?,?,?)"
! 	savedgroups.each { |g|
! 		sth.execute(*g)
! 	}
! end
  
  Db.dbh.disconnect