--- db/prgsrc/updatedb.pl 2009/05/24 10:10:17 1.46 +++ db/prgsrc/updatedb.pl 2010/04/24 18:04:14 1.47 @@ -28,17 +28,18 @@ The database, user and password are hard Dmitry Rubinstein -=head1 $Id: updatedb.pl,v 1.46 2009/05/24 10:10:17 roma7 Exp $ +=head1 $Id: updatedb.pl,v 1.47 2010/04/24 18:04:14 roma7 Exp $ =cut -use vars qw($opt_i); +use vars qw($opt_i, $opt_n); use Getopt::Std; my $unsortedname="../dump/unsorted"; -getopts('i'); +getopts('in'); #open STDERR, ">errors"; my $Interactive=$opt_i || 0; +my $newOnly = $opt_n ||0; my $DUMPDIR = $ENV{DUMPDIR} || "../dump"; my (%RevMonths) = @@ -172,8 +173,8 @@ sub SelectGroup { $sth = $dbh->prepare("INSERT INTO Tournaments (Title, Type, ParentId, FileName,CreatedAt) VALUES (".$dbh->quote($TourName).", 'Ч', $ParentId, - $source,NOW())"); - $sth->execute; + ?,NOW())"); + $sth->execute($source); my $TournamentId = $sth->{mysql_insertid}; return ($TournamentId,$ParentId); } @@ -220,6 +221,9 @@ sub CheckFile { } my($Id,$ParentId,$QuestionsNum)=@arr; if($QuestionsNum) { + if ($newOnly) { + return (0,0); + } print "Файл $source с данными $title уже существует. ", "Заменить?[y/N]\n"; my $answer = ; @@ -304,7 +308,7 @@ MAIN: my($source); - my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "") + my($dbh) = DBI->connect("DBI:mysql:db_drupal", "root", "") or die "Can't connect to DB chgk\n"; if ($dbh->get_info( 18 )=~/^(5|(4.1))/) {$dbh->do("SET NAMES 'koi8r'");} my @sources;