[mb-commits] r11052 - in mb_server/branches/TemplateToolkit: admin admin/ar admin/cleanup admin/replication admin/reports admin/sql admin/sql/updates admin/statistics bin lib
root at musicbrainz.org
root at musicbrainz.org
Fri Jan 16 20:52:46 UTC 2009
Author: luks
Date: 2009-01-16 20:52:46 +0000 (Fri, 16 Jan 2009)
New Revision: 11052
Modified:
mb_server/branches/TemplateToolkit/admin/CheckVotes.pl
mb_server/branches/TemplateToolkit/admin/CollectStats.pl
mb_server/branches/TemplateToolkit/admin/ExportAllTables
mb_server/branches/TemplateToolkit/admin/InitDb.pl
mb_server/branches/TemplateToolkit/admin/MBImport.pl
mb_server/branches/TemplateToolkit/admin/NotifySubscribersAboutPublic
mb_server/branches/TemplateToolkit/admin/ProcessSubscriptions
mb_server/branches/TemplateToolkit/admin/RDFDump.pl
mb_server/branches/TemplateToolkit/admin/RebuildArtistWords
mb_server/branches/TemplateToolkit/admin/SendMailForUnverifiedAccounts
mb_server/branches/TemplateToolkit/admin/SetLanguageFrequencies
mb_server/branches/TemplateToolkit/admin/SetSequences.pl
mb_server/branches/TemplateToolkit/admin/SubscribeAutomodsToList
mb_server/branches/TemplateToolkit/admin/UpdateWordCounts
mb_server/branches/TemplateToolkit/admin/ar/ImportLinkAttrs
mb_server/branches/TemplateToolkit/admin/ar/ImportLinkTypes
mb_server/branches/TemplateToolkit/admin/ar/ImportLinks
mb_server/branches/TemplateToolkit/admin/build_words.pl
mb_server/branches/TemplateToolkit/admin/cleanup/ArchiveOldModerations
mb_server/branches/TemplateToolkit/admin/cleanup/EmptyArtists.pl
mb_server/branches/TemplateToolkit/admin/cleanup/FixDiscIDsAndTOCs
mb_server/branches/TemplateToolkit/admin/cleanup/FixFeaturingArtists
mb_server/branches/TemplateToolkit/admin/cleanup/FixPageIndexValues
mb_server/branches/TemplateToolkit/admin/cleanup/FixTrackLength.pl
mb_server/branches/TemplateToolkit/admin/cleanup/Main.pl
mb_server/branches/TemplateToolkit/admin/cleanup/ModPending.pl
mb_server/branches/TemplateToolkit/admin/cleanup/RemoveAnnotations
mb_server/branches/TemplateToolkit/admin/cleanup/SmartQuotes
mb_server/branches/TemplateToolkit/admin/cleanup/UnusedTracks
mb_server/branches/TemplateToolkit/admin/cleanup/UpdateCoverArt.pl
mb_server/branches/TemplateToolkit/admin/replication/ImportReplicationChanges
mb_server/branches/TemplateToolkit/admin/replication/LoadReplicationChanges
mb_server/branches/TemplateToolkit/admin/replication/ProcessReplicationChanges
mb_server/branches/TemplateToolkit/admin/reports/AlbumsToConvert.pl
mb_server/branches/TemplateToolkit/admin/reports/DuplicateArtists.inc
mb_server/branches/TemplateToolkit/admin/reports/TracksNamedWithSequence.pl
mb_server/branches/TemplateToolkit/admin/sql/PopulateCountries.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20031004-1.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-2.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-3.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20031231-2.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20040326-1.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20040516-1.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20040730-1.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20050527-1.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-1.pl
mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-2.pl
mb_server/branches/TemplateToolkit/admin/statistics/GeneratePlot.pl
mb_server/branches/TemplateToolkit/bin/RemoveBadEmails
mb_server/branches/TemplateToolkit/bin/RevokeAutomod
mb_server/branches/TemplateToolkit/bin/check_last_replication_date
mb_server/branches/TemplateToolkit/lib/mq.pl
mb_server/branches/TemplateToolkit/lib/mq_2_1.pl
mb_server/branches/TemplateToolkit/lib/rdf.pl
mb_server/branches/TemplateToolkit/lib/rdf_2_1.pl
Log:
Actually, more things were broken the incomplete DBH -> dbh conversion, so let's just replace all of them.
Modified: mb_server/branches/TemplateToolkit/admin/CheckVotes.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/CheckVotes.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/CheckVotes.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -35,10 +35,10 @@
my $mb = MusicBrainz->new();
$mb->Login;
-my $el = MusicBrainz::Server::AutomodElection->new($mb->{DBH});
+my $el = MusicBrainz::Server::AutomodElection->new($mb->{dbh});
$el->DoCloseElections;
-my $mod = MusicBrainz::Server::ModBot->new($mb->{DBH});
+my $mod = MusicBrainz::Server::ModBot->new($mb->{dbh});
my $r = $mod->CheckModerations(@ARGV);
exit $r;
Modified: mb_server/branches/TemplateToolkit/admin/CollectStats.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/CollectStats.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/CollectStats.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -31,10 +31,10 @@
$mb = MusicBrainz->new;
$mb->Login;
-$sql = Sql->new($mb->{DBH});
+$sql = Sql->new($mb->{dbh});
use Statistic;
-my $s = Statistic->new($mb->{DBH});
+my $s = Statistic->new($mb->{dbh});
$sql->Begin;
$s->RecalculateAll;
Modified: mb_server/branches/TemplateToolkit/admin/ExportAllTables
===================================================================
--- mb_server/branches/TemplateToolkit/admin/ExportAllTables 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/ExportAllTables 2009-01-16 20:52:46 UTC (rev 11052)
@@ -109,14 +109,14 @@
# Log in to the main DB
my $mb = new MusicBrainz;
$mb->Login(db => 'READWRITE');
-my $sql = Sql->new($mb->{DBH});
-my $dbh = $mb->{DBH};
+my $sql = Sql->new($mb->{dbh});
+my $dbh = $mb->{dbh};
# Log in to the raw DB, or duplicate handles to the main DB
my $rawmb = new MusicBrainz;
$rawmb->Login(db => 'RAWDATA');
-my $rawsql = Sql->new($rawmb->{DBH});
-my $rawdbh = $rawmb->{DBH};
+my $rawsql = Sql->new($rawmb->{dbh});
+my $rawdbh = $rawmb->{dbh};
# This hash indicates which tables may need to be pulled from a vertical DB
my %table_db_mapping =
Modified: mb_server/branches/TemplateToolkit/admin/InitDb.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/InitDb.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/InitDb.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -91,7 +91,7 @@
# Now connect to that database
my $mb = MusicBrainz->new;
$mb->Login(db => "SYSMB");
- my $sql = Sql->new($mb->{DBH});
+ my $sql = Sql->new($mb->{dbh});
$sql->AutoCommit;
$sql->Do(
@@ -109,7 +109,7 @@
my ($name) = shift;
$mb = MusicBrainz->new;
$mb->Login(db => $name);
- $sql = Sql->new($mb->{DBH});
+ $sql = Sql->new($mb->{dbh});
}
}
@@ -248,7 +248,7 @@
my $mb = MusicBrainz->new;
$mb->Login(db => $name);
- my $dbh = $mb->{DBH};
+ my $dbh = $mb->{dbh};
$dbh->{AutoCommit} = 1;
my $username = $READONLY->username;
Modified: mb_server/branches/TemplateToolkit/admin/MBImport.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/MBImport.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/MBImport.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -92,12 +92,12 @@
my $mb = MusicBrainz->new;
$mb->Login(db => "READWRITE");
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
# Log in to the raw DB
my $rawmb = new MusicBrainz;
$rawmb->Login(db => 'RAWDATA');
-my $rawsql = Sql->new($rawmb->{DBH});
+my $rawsql = Sql->new($rawmb->{dbh});
# This hash indicates which tables may need to be pulled from a vertical DB
my %table_db_mapping =
@@ -261,7 +261,7 @@
$sql->Begin;
$sql->Do("COPY $table FROM stdin");
- my $dbh = $sql->{DBH};
+ my $dbh = $sql->{dbh};
$p->("", "") if $fProgress;
my $t;
Modified: mb_server/branches/TemplateToolkit/admin/NotifySubscribersAboutPublic
===================================================================
--- mb_server/branches/TemplateToolkit/admin/NotifySubscribersAboutPublic 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/NotifySubscribersAboutPublic 2009-01-16 20:52:46 UTC (rev 11052)
@@ -11,14 +11,14 @@
my $mb = new MusicBrainz;
$mb->Login;
-my $sql = new Sql($mb->{DBH});
+my $sql = new Sql($mb->{dbh});
my $accs = $sql->SelectListOfHashes("SELECT * FROM moderator where email!='' AND emailconfirmdate IS NOT NULL
AND id IN (SELECT moderator FROM moderator_subscribe_artist)
ORDER BY name");
# my $accs = $sql->SelectListOfHashes("SELECT * FROM moderator where name='djce'");
-my $users = UserStuff->new($mb->{DBH});
+my $users = UserStuff->new($mb->{dbh});
for my $acc (@$accs)
{
Modified: mb_server/branches/TemplateToolkit/admin/ProcessSubscriptions
===================================================================
--- mb_server/branches/TemplateToolkit/admin/ProcessSubscriptions 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/ProcessSubscriptions 2009-01-16 20:52:46 UTC (rev 11052)
@@ -35,7 +35,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $subs = UserSubscription->new($mb->{DBH});
+my $subs = UserSubscription->new($mb->{dbh});
$subs->{'verbose'} = 1 if -t;
use Getopt::Long;
Modified: mb_server/branches/TemplateToolkit/admin/RDFDump.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/RDFDump.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/RDFDump.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -63,7 +63,7 @@
$mb = MusicBrainz->new;
$mb->Login;
-$sql = Sql->new($mb->{DBH});
+$sql = Sql->new($mb->{dbh});
$rdf = MM_2_1->new();
print RDF $rdf->BeginRDFObject(1);
print RDF "\n";
@@ -172,8 +172,8 @@
$start = time;
$mx = $sql->Rows();
- $album = MusicBrainz::Server::Release->new($sql->{DBH});
- $sql2 = Sql->new($sql->{DBH});
+ $album = MusicBrainz::Server::Release->new($sql->{dbh});
+ $sql2 = Sql->new($sql->{dbh});
$sql2->Select(
"SELECT j.album, t.discid
FROM album_cdtoc j, cdtoc t
@@ -299,7 +299,7 @@
$start = time;
$mx = $sql->Rows();
- $sql2 = Sql->new($sql->{DBH});
+ $sql2 = Sql->new($sql->{dbh});
if (!$sql2->Select(qq|select TRMJoin.track, TRM.trm
from TRMJoin, TRM
where TRMJoin.trm = TRM.id
Modified: mb_server/branches/TemplateToolkit/admin/RebuildArtistWords
===================================================================
--- mb_server/branches/TemplateToolkit/admin/RebuildArtistWords 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/RebuildArtistWords 2009-01-16 20:52:46 UTC (rev 11052)
@@ -90,7 +90,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
rebuild("artist", "Artist", $artist);
rebuild("album", "Album", $album);
@@ -118,7 +118,7 @@
print localtime() . " : Processing rows $start-$end in $table\n"
if defined $end;
- my $obj = $class->new($mb->{DBH});
+ my $obj = $class->new($mb->{dbh});
use Time::HiRes qw( gettimeofday tv_interval );
$start ||= 0;
Modified: mb_server/branches/TemplateToolkit/admin/SendMailForUnverifiedAccounts
===================================================================
--- mb_server/branches/TemplateToolkit/admin/SendMailForUnverifiedAccounts 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/SendMailForUnverifiedAccounts 2009-01-16 20:52:46 UTC (rev 11052)
@@ -11,12 +11,12 @@
my $mb = new MusicBrainz;
$mb->Login;
-my $sql = new Sql($mb->{DBH});
+my $sql = new Sql($mb->{dbh});
my $accs = $sql->SelectListOfHashes("SELECT * FROM moderator where email!='' AND emailconfirmdate IS NULL ORDER BY name");
# my $accs = $sql->SelectListOfHashes("SELECT * FROM moderator where name='djce'");
-my $users = UserStuff->new($mb->{DBH});
+my $users = UserStuff->new($mb->{dbh});
for my $acc (@$accs)
{
Modified: mb_server/branches/TemplateToolkit/admin/SetLanguageFrequencies
===================================================================
--- mb_server/branches/TemplateToolkit/admin/SetLanguageFrequencies 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/SetLanguageFrequencies 2009-01-16 20:52:46 UTC (rev 11052)
@@ -45,7 +45,7 @@
my $mb = MusicBrainz->new();
$mb->Login();
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
#
# Set the frequency attribute of the language table.
@@ -56,7 +56,7 @@
foreach my $code ( PRESELECTED_LANGUAGES )
{
my $lang = MusicBrainz::Server::Language->newFromISOCode3T(
- $mb->{DBH}, $code);
+ $mb->{dbh}, $code);
$languages{ $lang->GetId() } = 1;
}
Modified: mb_server/branches/TemplateToolkit/admin/SetSequences.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/SetSequences.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/SetSequences.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -62,7 +62,7 @@
my $mb = MusicBrainz->new;
$mb->Login(db => "READWRITE");
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
SetSequence($sql, "album");
SetSequence($sql, "albumjoin");
Modified: mb_server/branches/TemplateToolkit/admin/SubscribeAutomodsToList
===================================================================
--- mb_server/branches/TemplateToolkit/admin/SubscribeAutomodsToList 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/SubscribeAutomodsToList 2009-01-16 20:52:46 UTC (rev 11052)
@@ -41,7 +41,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
use vars qw( %allowed_nonmember_automods %allowed_posting_guests );
Modified: mb_server/branches/TemplateToolkit/admin/UpdateWordCounts
===================================================================
--- mb_server/branches/TemplateToolkit/admin/UpdateWordCounts 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/UpdateWordCounts 2009-01-16 20:52:46 UTC (rev 11052)
@@ -56,12 +56,12 @@
(my $mb1 = MusicBrainz->new)->Login;
(my $mb2 = MusicBrainz->new)->Login;
-my $sqlRead = Sql->new($mb1->{DBH});
-my $sqlWrite = Sql->new($mb2->{DBH});
+my $sqlRead = Sql->new($mb1->{dbh});
+my $sqlWrite = Sql->new($mb2->{dbh});
if ($do_update) {
-my $sth = $sqlWrite->{DBH}->prepare(
+my $sth = $sqlWrite->{dbh}->prepare(
"UPDATE wordlist
SET artistusecount = ?, albumusecount = ?, trackusecount = ?, labelusecount = ?
WHERE id = ?
Modified: mb_server/branches/TemplateToolkit/admin/ar/ImportLinkAttrs
===================================================================
--- mb_server/branches/TemplateToolkit/admin/ar/ImportLinkAttrs 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/ar/ImportLinkAttrs 2009-01-16 20:52:46 UTC (rev 11052)
@@ -146,7 +146,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
#use Data::Dumper;
#print Dumper(\%tree);
Modified: mb_server/branches/TemplateToolkit/admin/ar/ImportLinkTypes
===================================================================
--- mb_server/branches/TemplateToolkit/admin/ar/ImportLinkTypes 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/ar/ImportLinkTypes 2009-01-16 20:52:46 UTC (rev 11052)
@@ -270,7 +270,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
foreach my $x (qw(album artist track url))
{
Modified: mb_server/branches/TemplateToolkit/admin/ar/ImportLinks
===================================================================
--- mb_server/branches/TemplateToolkit/admin/ar/ImportLinks 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/ar/ImportLinks 2009-01-16 20:52:46 UTC (rev 11052)
@@ -35,7 +35,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$sql->Begin();
my ($ent0, $ent1, $rel, $rem, $line);
@@ -51,8 +51,8 @@
$rel =~ s/^\s*|\s*$//g;
#print "$ent0 $ent1 $rel\n";
- my $ar0 = MusicBrainz::Server::Artist->new($mb->{DBH});
- my $ar1 = MusicBrainz::Server::Artist->new($mb->{DBH});
+ my $ar0 = MusicBrainz::Server::Artist->new($mb->{dbh});
+ my $ar1 = MusicBrainz::Server::Artist->new($mb->{dbh});
$ar0->SetMBId($ent0);
$ar1->SetMBId($ent1);
Modified: mb_server/branches/TemplateToolkit/admin/build_words.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/build_words.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/build_words.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -31,7 +31,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $engine = SearchEngine->new($mb->{DBH});
+my $engine = SearchEngine->new($mb->{dbh});
$engine->RebuildAllIndices;
$mb->Logout();
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/ArchiveOldModerations
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/ArchiveOldModerations 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/ArchiveOldModerations 2009-01-16 20:52:46 UTC (rev 11052)
@@ -90,11 +90,11 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
my $threshold_time = time() - 86400 * 60; # 60 days
-my $threshold_mod_id = Moderation->iFindByTime($mb->{DBH}, $threshold_time);
-my ($iMin, $iMax) = Moderation->iiMinMaxID($mb->{DBH});
+my $threshold_mod_id = Moderation->iFindByTime($mb->{dbh}, $threshold_time);
+my ($iMin, $iMax) = Moderation->iiMinMaxID($mb->{dbh});
$iMin = $start_id if $start_id;
print localtime() . " : min=$iMin threshold=$threshold_mod_id max=$iMax\n";
@@ -239,7 +239,7 @@
my $max = 315_000; my $maxline = __LINE__;
my $longest = 0;
- my $dbh = $sql->{DBH};
+ my $dbh = $sql->{dbh};
while ($dbh->func($buffer, $max, "getline"))
{
die "\nProbable data truncation! See $0 line $maxline"
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/EmptyArtists.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/EmptyArtists.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/EmptyArtists.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -41,15 +41,15 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
my $mb2 = MusicBrainz->new;
$mb2->Login;
-my $sqlWrite = Sql->new($mb2->{DBH});
+my $sqlWrite = Sql->new($mb2->{dbh});
my $vertmb = new MusicBrainz;
$vertmb->Login(db => 'RAWDATA');
-my $sqlVert = Sql->new($vertmb->{DBH});
+my $sqlVert = Sql->new($vertmb->{dbh});
my $use_auto_mod = 1;
my $moderator = &ModDefs::MODBOT_MODERATOR;
@@ -61,7 +61,7 @@
"automod!" => \$use_auto_mod,
"moderator=s" => sub {
my $user = $_[1];
- my $u = UserStuff->new($mb->{DBH});
+ my $u = UserStuff->new($mb->{dbh});
(undef, my $uid) = $u->GetUserPasswordAndId($user);
$uid or die "No such moderator '$user'";
$moderator = $uid;
@@ -231,7 +231,7 @@
eval
{
use MusicBrainz::Server::Artist;
- my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{dbh});
# No need to load the whole record, hopefully...
$ar->SetId($id);
@@ -240,7 +240,7 @@
use Moderation;
my @mods = Moderation->InsertModeration(
- DBH => $sqlWrite->{DBH},
+ DBH => $sqlWrite->{dbh},
uid => $moderator,
privs => $privs,
type => &ModDefs::MOD_REMOVE_ARTIST,
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/FixDiscIDsAndTOCs
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/FixDiscIDsAndTOCs 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/FixDiscIDsAndTOCs 2009-01-16 20:52:46 UTC (rev 11052)
@@ -80,7 +80,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$| = 1 if $progress;
# Look for rows where discid and/or freedbid do not match the implied TOC,
@@ -99,7 +99,7 @@
my $i = 0;
require MusicBrainz::Server::CDTOC;
-my $cdtocfactory = MusicBrainz::Server::CDTOC->new($mb->{DBH});
+my $cdtocfactory = MusicBrainz::Server::CDTOC->new($mb->{dbh});
while (my $row = $sql->NextRowHashRef)
{
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/FixFeaturingArtists
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/FixFeaturingArtists 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/FixFeaturingArtists 2009-01-16 20:52:46 UTC (rev 11052)
@@ -43,11 +43,11 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
my $mbWrite = MusicBrainz->new;
$mbWrite->Login;
-my $sqlWrite = Sql->new($mbWrite->{DBH});
+my $sqlWrite = Sql->new($mbWrite->{dbh});
#
# Default options.
@@ -67,7 +67,7 @@
"automod!" => \$opt_use_automod,
"moderator=s" => sub {
my $user = $_[1];
- my $u = UserStuff->new($mb->{DBH});
+ my $u = UserStuff->new($mb->{dbh});
(undef, my $uid) = $u->GetUserPasswordAndId($user);
die "No such moderator '$user'\n" unless $uid;
$opt_moderator = $uid;
@@ -204,7 +204,7 @@
# Create a Track object. Just as much as necessary to enter the mod.
#
- my $track = MusicBrainz::Server::Track->new($sql->{DBH});
+ my $track = MusicBrainz::Server::Track->new($sql->{dbh});
$track->SetId($trackid);
$track->SetArtist($artistid);
$track->SetName($oldname);
@@ -214,7 +214,7 @@
eval
{
my @mods = Moderation->InsertModeration(
- DBH => $sql->{DBH},
+ DBH => $sql->{dbh},
uid => $modid,
privs => $privs,
type => &ModDefs::MOD_EDIT_TRACKNAME,
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/FixPageIndexValues
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/FixPageIndexValues 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/FixPageIndexValues 2009-01-16 20:52:46 UTC (rev 11052)
@@ -73,13 +73,13 @@
my $mbRead = new MusicBrainz;
$mbRead->Login;
-my $sqlRead = Sql->new($mbRead->{DBH});
+my $sqlRead = Sql->new($mbRead->{dbh});
my $mbWrite = new MusicBrainz;
$mbWrite->Login;
-my $sqlWrite = Sql->new($mbWrite->{DBH});
+my $sqlWrite = Sql->new($mbWrite->{dbh});
-my $tb = TableBase->new($mbRead->{DBH});
+my $tb = TableBase->new($mbRead->{dbh});
Process("album", "name") if $do{"album"};
Process("artist", "sortname") if $do{"artist"};
@@ -121,7 +121,7 @@
printf STDERR "Error fixing %s #%d: %s\n",
$table, $id, $@;
- if (not $sqlWrite->{DBH}->{AutoCommit})
+ if (not $sqlWrite->{dbh}->{AutoCommit})
{
$sqlWrite->Rollback;
}
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/FixTrackLength.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/FixTrackLength.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/FixTrackLength.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -62,7 +62,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$| = 1;
my $privs = &UserStuff::AUTOMOD_FLAG;
my $moderator = &ModDefs::MODBOT_MODERATOR;
@@ -93,7 +93,7 @@
no warnings 'exiting';
eval {
- my $tocs = MusicBrainz::Server::ReleaseCDTOC->newFromRelease($mb->{DBH}, $id);
+ my $tocs = MusicBrainz::Server::ReleaseCDTOC->newFromRelease($mb->{dbh}, $id);
$_ = $_->GetCDTOC for @$tocs;
if ($debug)
@@ -133,7 +133,7 @@
# tracks, and all the tracks have no length.
if (@$tocs == 1)
{
- my $release = MusicBrainz::Server::Release->new($mb->{DBH});
+ my $release = MusicBrainz::Server::Release->new($mb->{dbh});
$release->SetId($id);
$release->SetArtist($album->{artist});
@@ -171,7 +171,7 @@
if $verbose;
my @mods = Moderation->InsertModeration(
- DBH => $mb->{DBH},
+ DBH => $mb->{dbh},
uid => $moderator,
privs => $privs,
type => &ModDefs::MOD_SET_RELEASE_DURATIONS,
@@ -253,7 +253,7 @@
{
# TODO? next if $t->{length} > 0;
my $new_length = int($average_toc[$t->{sequence}-1]);
- my $track = MusicBrainz::Server::Track->new($mb->{DBH});
+ my $track = MusicBrainz::Server::Track->new($mb->{dbh});
$track->SetId($t->{id});
$track->SetArtist($t->{artist});
$track->SetLength($t->{length});
@@ -262,7 +262,7 @@
if $verbose;
my @mods = Moderation->InsertModeration(
- DBH => $mb->{DBH},
+ DBH => $mb->{dbh},
uid => $moderator,
privs => $privs,
type => &ModDefs::MOD_EDIT_TRACKTIME,
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/Main.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/Main.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/Main.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -79,7 +79,7 @@
$mb = MusicBrainz->new;
$mb->Login;
- Cleanup($mb->{DBH}, $fix, $quiet, @ARGV);
+ Cleanup($mb->{dbh}, $fix, $quiet, @ARGV);
# Disconnect
$mb->Logout;
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/ModPending.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/ModPending.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/ModPending.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -79,7 +79,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$verbose
? open(LOG, ">&STDOUT")
@@ -224,7 +224,7 @@
# For each open moderation, construct the handler object and call its
# "AdjustModPending" method
-my $modclass = Moderation->new($mb->{DBH});
+my $modclass = Moderation->new($mb->{dbh});
my $n = 0;
$eachmod
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/RemoveAnnotations
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/RemoveAnnotations 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/RemoveAnnotations 2009-01-16 20:52:46 UTC (rev 11052)
@@ -63,7 +63,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$sql->AutoCommit;
$| = 1;
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/SmartQuotes
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/SmartQuotes 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/SmartQuotes 2009-01-16 20:52:46 UTC (rev 11052)
@@ -40,11 +40,11 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
my $mb2 = MusicBrainz->new;
$mb2->Login;
-my $sqlWrite = Sql->new($mb2->{DBH});
+my $sqlWrite = Sql->new($mb2->{dbh});
my $use_auto_mod = 1;
my $moderator = &ModDefs::MODBOT_MODERATOR;
@@ -62,7 +62,7 @@
"automod!" => \$use_auto_mod,
"moderator=s" => sub {
my $user = $_[1];
- my $u = UserStuff->new($mb->{DBH});
+ my $u = UserStuff->new($mb->{dbh});
(undef, my $uid) = $u->GetUserPasswordAndId($user);
$uid or die "No such moderator '$user'";
$moderator = $uid;
@@ -185,7 +185,7 @@
# open "merge" mods, and not add the mod if it's already
# there.
require MusicBrainz::Server::Artist;
- my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($sqlWrite->{dbh});
$ar->SetId($id);
$ar->SetName(encode "utf-8", $oname);
$ar->SetSortName(encode "utf-8", $oname);
@@ -194,7 +194,7 @@
elsif ($table eq "artistalias")
{
require MusicBrainz::Server::Alias;
- my $al = MusicBrainz::Server::Alias->new($sqlWrite->{DBH}, 'artistalias');
+ my $al = MusicBrainz::Server::Alias->new($sqlWrite->{dbh}, 'artistalias');
$al->SetId($id);
$al->SetRowId($artistid);
$al->SetName(encode "utf-8", $oname);
@@ -203,7 +203,7 @@
elsif ($table eq "album")
{
require MusicBrainz::Server::Release;
- my $al = MusicBrainz::Server::Release->new($sqlWrite->{DBH});
+ my $al = MusicBrainz::Server::Release->new($sqlWrite->{dbh});
$al->SetId($id);
$al->SetArtist($artistid);
$al->SetName(encode "utf-8", $oname);
@@ -212,7 +212,7 @@
elsif ($table eq "track")
{
require MusicBrainz::Server::Track;
- my $tr = MusicBrainz::Server::Track->new($sqlWrite->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($sqlWrite->{dbh});
$tr->SetId($id);
$tr->SetArtist($artistid);
$tr->SetName(encode "utf-8", $oname);
@@ -223,7 +223,7 @@
use Moderation;
push @mods, Moderation->InsertModeration(
- DBH => $sqlWrite->{DBH},
+ DBH => $sqlWrite->{dbh},
uid => $moderator,
privs => $privs,
type => $modtype,
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/UnusedTracks
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/UnusedTracks 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/UnusedTracks 2009-01-16 20:52:46 UTC (rev 11052)
@@ -40,11 +40,11 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
my $mb2 = MusicBrainz->new;
$mb2->Login;
-my $sqlWrite = Sql->new($mb2->{DBH});
+my $sqlWrite = Sql->new($mb2->{dbh});
my $remove = 1;
my $verbose;
@@ -117,7 +117,7 @@
eval
{
use MusicBrainz::Server::Track;
- my $tr = MusicBrainz::Server::Track->new($sqlWrite->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($sqlWrite->{dbh});
$tr->SetId($id);
$tr->Remove;
$sqlWrite->Commit;
Modified: mb_server/branches/TemplateToolkit/admin/cleanup/UpdateCoverArt.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/cleanup/UpdateCoverArt.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/cleanup/UpdateCoverArt.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -52,7 +52,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$| = 1;
# Update Amazon Cover Art
@@ -65,7 +65,7 @@
and (coverarturl = '' OR coverarturl is null)");
while (my ($id, $asin, $coverarturl, $url) = $sql->NextRow)
{
- my $al = MusicBrainz::Server::Release->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{dbh});
$al->SetId($id);
if ($al->LoadFromId(1))
{
Modified: mb_server/branches/TemplateToolkit/admin/replication/ImportReplicationChanges
===================================================================
--- mb_server/branches/TemplateToolkit/admin/replication/ImportReplicationChanges 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/replication/ImportReplicationChanges 2009-01-16 20:52:46 UTC (rev 11052)
@@ -70,7 +70,7 @@
my $mb = MusicBrainz->new;
$mb->Login(db => "READWRITE");
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
for my $arg (@ARGV)
{
@@ -140,7 +140,7 @@
$sql->Begin;
$sql->Do("COPY \"$table\" FROM stdin");
- my $dbh = $sql->{DBH};
+ my $dbh = $sql->{dbh};
$p->("", "");
Modified: mb_server/branches/TemplateToolkit/admin/replication/LoadReplicationChanges
===================================================================
--- mb_server/branches/TemplateToolkit/admin/replication/LoadReplicationChanges 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/replication/LoadReplicationChanges 2009-01-16 20:52:46 UTC (rev 11052)
@@ -95,8 +95,8 @@
$mb->Login(db => "READWRITE");
use Sql;
-my $sql = Sql->new($mb->{DBH});
-my $dbh = $mb->{DBH};
+my $sql = Sql->new($mb->{dbh});
+my $dbh = $mb->{dbh};
# Retrieve current_schema_sequence and current_replication_sequence
Modified: mb_server/branches/TemplateToolkit/admin/replication/ProcessReplicationChanges
===================================================================
--- mb_server/branches/TemplateToolkit/admin/replication/ProcessReplicationChanges 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/replication/ProcessReplicationChanges 2009-01-16 20:52:46 UTC (rev 11052)
@@ -83,9 +83,9 @@
my $mb = MusicBrainz->new;
$mb->Login(db => "READWRITE");
-my $sql = Sql->new($mb->{DBH});
-my $sql2 = Sql->new($mb->{DBH});
-my $slave = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
+my $sql2 = Sql->new($mb->{dbh});
+my $slave = Sql->new($mb->{dbh});
$sql->AutoCommit;
$sql->Do("SET search_path = public");
Modified: mb_server/branches/TemplateToolkit/admin/reports/AlbumsToConvert.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/reports/AlbumsToConvert.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/reports/AlbumsToConvert.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -85,7 +85,7 @@
for my $album (@album_ids)
{
- my $al = MusicBrainz::Server::Release->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{dbh});
$al->SetId($album);
$al->LoadFromId or next;
Modified: mb_server/branches/TemplateToolkit/admin/reports/DuplicateArtists.inc
===================================================================
--- mb_server/branches/TemplateToolkit/admin/reports/DuplicateArtists.inc 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/reports/DuplicateArtists.inc 2009-01-16 20:52:46 UTC (rev 11052)
@@ -110,7 +110,7 @@
% my $j = 0;
% foreach my $row ( @$dupelist )
% {
-% my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
+% my $ar = MusicBrainz::Server::Artist->new($mb->{dbh});
% $ar->SetId( $row->{artist_id} );
% $ar->LoadFromId();
Modified: mb_server/branches/TemplateToolkit/admin/reports/TracksNamedWithSequence.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/reports/TracksNamedWithSequence.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/reports/TracksNamedWithSequence.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -71,8 +71,8 @@
push @{ $artists->{ $_->[0] }{ALBUMS}{ $_->[1] }{TRACKS} }, $_;
}
- my $al = MusicBrainz::Server::Release->new($self->{DBH});
- my $ar = MusicBrainz::Server::Artist->new($self->{DBH});
+ my $al = MusicBrainz::Server::Release->new($self->{dbh});
+ my $ar = MusicBrainz::Server::Artist->new($self->{dbh});
for my $artistid (keys %$artists)
{
Modified: mb_server/branches/TemplateToolkit/admin/sql/PopulateCountries.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/PopulateCountries.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/PopulateCountries.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -34,7 +34,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
use strict;
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20031004-1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20031004-1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20031004-1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -34,7 +34,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$sql->Begin;
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-2.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-2.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-2.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -34,7 +34,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$sql->Begin;
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-3.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-3.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20031025-3.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -34,7 +34,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
# One-off scan, doesn't take too long
$| = 1;
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20031231-2.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20031231-2.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20031231-2.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -39,9 +39,9 @@
my $mb1 = MusicBrainz->new; $mb1->Login;
my $mb2 = MusicBrainz->new; $mb2->Login;
my $mb3 = MusicBrainz->new; $mb3->Login;
-my $dbh_read = $mb1->{DBH};
-my $dbh_true = $mb2->{DBH};
-my $dbh_false = $mb3->{DBH};
+my $dbh_read = $mb1->{dbh};
+my $dbh_true = $mb2->{dbh};
+my $dbh_false = $mb3->{dbh};
my $sql_read = Sql->new($dbh_read);
my $sql_true = Sql->new($dbh_true);
my $sql_false = Sql->new($dbh_false);
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20040326-1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20040326-1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20040326-1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -40,7 +40,7 @@
$| = 1 if -t STDOUT;
my $mb = MusicBrainz->new; $mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
my $rows;
my ($updated, $failed);
@@ -67,20 +67,20 @@
$sql->Begin;
require MusicBrainz::Server::Artist;
- my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
+ my $ar = MusicBrainz::Server::Artist->new($mb->{dbh});
$ar->SetId($id);
$ar->LoadFromId or die "No artist #$id";
unless ($name eq $_->[1])
{
# Is there already an artist with the new name?
- my $mergeinto = MusicBrainz::Server::Artist->new($mb->{DBH});
+ my $mergeinto = MusicBrainz::Server::Artist->new($mb->{dbh});
if ($mergeinto->LoadFromName($name) and $mergeinto->GetName eq $name)
{
# Merge $ar into $mergeinto
require Moderation;
my @mods = Moderation->InsertModeration(
- DBH => $mb->{DBH},
+ DBH => $mb->{dbh},
uid => MODBOT_MODERATOR,
privs => &UserStuff::AUTOMOD_FLAG,
type => MOD_MERGE_ARTIST,
@@ -94,7 +94,7 @@
{
my $status = $mod->ApprovedAction;
$mod->SetStatus($status);
- my $user = UserStuff->new($mb->{DBH});
+ my $user = UserStuff->new($mb->{dbh});
$user->CreditModerator($mod->GetModerator, $status);
$mod->CloseModeration($status);
$mod->InsertNote(MODBOT_MODERATOR, "Automatically approved");
@@ -142,7 +142,7 @@
$sql->Begin;
require MusicBrainz::Server::Release;
- my $al = MusicBrainz::Server::Release->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{dbh});
$al->SetId($id);
$al->LoadFromId or die "No album #$id";
@@ -183,7 +183,7 @@
$sql->Begin;
require MusicBrainz::Server::Track;
- my $tr = MusicBrainz::Server::Track->new($mb->{DBH});
+ my $tr = MusicBrainz::Server::Track->new($mb->{dbh});
$tr->SetId($id);
$tr->LoadFromId or die "No track #$id";
@@ -224,7 +224,7 @@
$sql->Begin;
require MusicBrainz::Server::Alias;
- my $alias = MusicBrainz::Server::Alias->new($mb->{DBH}, "artistalias");
+ my $alias = MusicBrainz::Server::Alias->new($mb->{dbh}, "artistalias");
$alias->SetId($id);
$alias->LoadFromId or die "No artist alias #$id";
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20040516-1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20040516-1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20040516-1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -39,7 +39,7 @@
$| = 1 if -t STDOUT;
my $mb = MusicBrainz->new; $mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$sql->Begin;
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20040730-1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20040730-1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20040730-1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -38,7 +38,7 @@
$| = 1 if -t STDOUT;
my $mb = MusicBrainz->new; $mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$sql->Begin;
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20050527-1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20050527-1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20050527-1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -38,7 +38,7 @@
$SIG{INT} = sub { die "Interrupt\n" };
my $mb = MusicBrainz->new; $mb->Login(db => "READWRITE");
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
process("artist");
process("album");
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -45,7 +45,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$verbose
? open(LOG, ">&STDOUT")
Modified: mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-2.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-2.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/sql/updates/20060305-2.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -43,7 +43,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
$verbose
? open(LOG, ">&STDOUT")
@@ -71,7 +71,7 @@
my %done;
for my $link (@$rows)
{
- my $al = MusicBrainz::Server::Release->new($mb->{DBH});
+ my $al = MusicBrainz::Server::Release->new($mb->{dbh});
my $alid = $link->{alid};
$al->SetId($alid);
Modified: mb_server/branches/TemplateToolkit/admin/statistics/GeneratePlot.pl
===================================================================
--- mb_server/branches/TemplateToolkit/admin/statistics/GeneratePlot.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/admin/statistics/GeneratePlot.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -31,7 +31,7 @@
$mb = MusicBrainz->new;
$mb->Login;
-$sql = Sql->new($mb->{DBH});
+$sql = Sql->new($mb->{dbh});
my $ImageDir = shift;
-d $ImageDir or die "Usage: GeneratePlot.pl <imagedir>";
Modified: mb_server/branches/TemplateToolkit/bin/RemoveBadEmails
===================================================================
--- mb_server/branches/TemplateToolkit/bin/RemoveBadEmails 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/bin/RemoveBadEmails 2009-01-16 20:52:46 UTC (rev 11052)
@@ -38,7 +38,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
eval {
$sql->Begin;
@@ -59,7 +59,7 @@
for (@$users)
{
my ($id, $name) = @$_;
- my $u = UserStuff->newFromId($mb->{DBH}, $id);
+ my $u = UserStuff->newFromId($mb->{dbh}, $id);
$u or die "User #$id not found";
$u->GetName eq $name or die "User #$id != $name";
print "Blanking email for #$id $name\n";
@@ -76,7 +76,7 @@
};
my $err = $@;
-print("Rolling back\n"), $sql->Rollback unless $sql->{DBH}{AutoCommit};
+print("Rolling back\n"), $sql->Rollback unless $sql->{dbh}{AutoCommit};
die $err if $err;
# eof
Modified: mb_server/branches/TemplateToolkit/bin/RevokeAutomod
===================================================================
--- mb_server/branches/TemplateToolkit/bin/RevokeAutomod 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/bin/RevokeAutomod 2009-01-16 20:52:46 UTC (rev 11052)
@@ -38,12 +38,12 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
eval {
$sql->Begin;
- my $u = UserStuff->newFromName($mb->{DBH}, $name);
+ my $u = UserStuff->newFromName($mb->{dbh}, $name);
$u or die "User '$name' not found";
$u->GetPrivs & &UserStuff::AUTOMOD_FLAG
or die "User '$name' is not an automod";
@@ -53,7 +53,7 @@
};
my $err = $@;
-print("Rolling back\n"), $sql->Rollback unless $sql->{DBH}{AutoCommit};
+print("Rolling back\n"), $sql->Rollback unless $sql->{dbh}{AutoCommit};
die $err if $err;
# eof
Modified: mb_server/branches/TemplateToolkit/bin/check_last_replication_date
===================================================================
--- mb_server/branches/TemplateToolkit/bin/check_last_replication_date 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/bin/check_last_replication_date 2009-01-16 20:52:46 UTC (rev 11052)
@@ -61,7 +61,7 @@
my $mb = MusicBrainz->new;
$mb->Login;
-my $sql = Sql->new($mb->{DBH});
+my $sql = Sql->new($mb->{dbh});
my $row = $sql->SelectSingleRowHash(
"
Modified: mb_server/branches/TemplateToolkit/lib/mq.pl
===================================================================
--- mb_server/branches/TemplateToolkit/lib/mq.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/lib/mq.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -327,8 +327,8 @@
exit(0);
}
-$rdf->SetDBH($mb->{DBH});
-$out = $function->($mb->{DBH}, $parser, $rdf, @queryargs, \%session);
+$rdf->SetDBH($mb->{dbh});
+$out = $function->($mb->{dbh}, $parser, $rdf, @queryargs, \%session);
$mb->Logout;
Modified: mb_server/branches/TemplateToolkit/lib/mq_2_1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/lib/mq_2_1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/lib/mq_2_1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -338,8 +338,8 @@
exit(0);
}
-$rdf->SetDBH($mb->{DBH});
-$out = $function->($mb->{DBH}, $parser, $rdf, @queryargs, \%session);
+$rdf->SetDBH($mb->{dbh});
+$out = $function->($mb->{dbh}, $parser, $rdf, @queryargs, \%session);
$mb->Logout;
Modified: mb_server/branches/TemplateToolkit/lib/rdf.pl
===================================================================
--- mb_server/branches/TemplateToolkit/lib/rdf.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/lib/rdf.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -87,14 +87,14 @@
}
else
{
- $rdf->SetDBH($mb->{DBH});
+ $rdf->SetDBH($mb->{dbh});
if (! exists $Queries{$query})
{
$out = $rdf->ErrorRDF("The query type $query not supported.");
}
else
{
- $out = $Queries{$query}($mb->{DBH}, undef, $rdf, $id);
+ $out = $Queries{$query}($mb->{dbh}, undef, $rdf, $id);
}
$mb->Logout;
}
Modified: mb_server/branches/TemplateToolkit/lib/rdf_2_1.pl
===================================================================
--- mb_server/branches/TemplateToolkit/lib/rdf_2_1.pl 2009-01-16 20:50:22 UTC (rev 11051)
+++ mb_server/branches/TemplateToolkit/lib/rdf_2_1.pl 2009-01-16 20:52:46 UTC (rev 11052)
@@ -91,14 +91,14 @@
}
else
{
- $rdf->SetDBH($mb->{DBH});
+ $rdf->SetDBH($mb->{dbh});
if (! exists $Queries{$query})
{
$out = $rdf->ErrorRDF("The query type $query not supported.");
}
else
{
- $out = $Queries{$query}($mb->{DBH}, undef, $rdf, $id);
+ $out = $Queries{$query}($mb->{dbh}, undef, $rdf, $id);
}
$mb->Logout;
}
More information about the MusicBrainz-commits
mailing list