Menu
▾
▴
[Ngetsuite-cvs] ngetsuite/web articles.rhtml,1.5,1.6 queue.rhtml,1.9,1.10 test.rhtml,1.7,1.8
|
From: <jj...@us...> - 2004-02-06 23:50:01
|
Update of /cvsroot/ngetsuite/ngetsuite/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11482/web Modified Files: articles.rhtml queue.rhtml test.rhtml Log Message: config: defaults are in config.rb (no need to .fetch), added 'daemon_debug', 'daemon_host', 'dbhost' ; changed 'autostart_httpd' to 'httpd_autostart', 'extern_nfo_update' to 'extern_nfos_update', 'port' to 'daemon_port' ; reqesting a config keyword inexisting raises an exception group: somewhat gives a success status, fixed shortname, *sexy* headers update global: removed some global variables ($dbh->Db.dbh..) Index: articles.rhtml =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/web/articles.rhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** articles.rhtml 9 Nov 2003 01:25:33 -0000 1.5 --- articles.rhtml 6 Feb 2004 23:46:59 -0000 1.6 *************** *** 2,5 **** --- 2,6 ---- require 'cgi' require 'ngetsuite/config' + require 'ngetsuite/db' conf = "/home/nget/.ngetsuite" *************** *** 8,15 **** require 'ngetsuite/queue' require 'ngetsuite/group' - require 'dbi' cgi = CGI.new() - $dbh = DBI.connect("DBI:Mysql:#{$config['dbname']}", $config['dbuser'], $config['dbpass']) $config['debug'] = false --- 9,14 ---- *************** *** 52,56 **** <ul> <% ! sth = $dbh.execute "select `fullname`, `shortname` from `groups`" sth.fetch do |row| puts "<li><a href=?group=#{row[0]}>#{row[0]} (#{row[1]})</a>" --- 51,55 ---- <ul> <% ! sth = Db.dbh.execute "select `fullname`, `shortname` from `groups`" sth.fetch do |row| puts "<li><a href=?group=#{row[0]}>#{row[0]} (#{row[1]})</a>" *************** *** 82,86 **** req += " order by `time` desc limit #{offset},#{articles_by_page}" ! sth = $dbh.execute req sth.fetch do |row| puts "<input type='hidden' name='mid' value='#{row[0]}'>" --- 81,85 ---- req += " order by `time` desc limit #{offset},#{articles_by_page}" ! sth = Db.dbh.execute req sth.fetch do |row| puts "<input type='hidden' name='mid' value='#{row[0]}'>" *************** *** 99,101 **** </body> </html> ! <% $dbh.disconnect %> --- 98,100 ---- </body> </html> ! <% Db.dbh.disconnect %> Index: queue.rhtml =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/web/queue.rhtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** queue.rhtml 1 Nov 2003 21:09:26 -0000 1.9 --- queue.rhtml 6 Feb 2004 23:46:59 -0000 1.10 *************** *** 2,13 **** require 'cgi' require 'ngetsuite/config' conf = "/home/nget/.ngetsuite" $config = NgetSuite::Config.new(conf) - $dbh = DBI.connect("DBI:Mysql:#{$config['dbname']}", $config['dbuser'], $config['dbpass']) require 'ngetsuite/queue' require 'ngetsuite/group' - require 'dbi' cgi = CGI.new() --- 2,12 ---- require 'cgi' require 'ngetsuite/config' + require 'ngetsuite/db' conf = "/home/nget/.ngetsuite" $config = NgetSuite::Config.new(conf) require 'ngetsuite/queue' require 'ngetsuite/group' cgi = CGI.new() *************** *** 79,83 **** req += ' order by `priority` desc' ! sth = $dbh.execute req sth.fetch do |row| q = NgetSuite::Queue.getqueue(row[0]) --- 78,82 ---- req += ' order by `priority` desc' ! sth = Db.dbh.execute req sth.fetch do |row| q = NgetSuite::Queue.getqueue(row[0]) *************** *** 115,117 **** </body> </html> ! <% $dbh.disconnect %> --- 114,116 ---- </body> </html> ! <% Db.dbh.disconnect %> Index: test.rhtml =================================================================== RCS file: /cvsroot/ngetsuite/ngetsuite/web/test.rhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** test.rhtml 9 Nov 2003 01:25:33 -0000 1.7 --- test.rhtml 6 Feb 2004 23:46:59 -0000 1.8 *************** *** 57,61 **** <body> <% - require 'dbi' require 'ngetsuite/config' require 'ngetsuite/utils' --- 57,60 ---- |
