refactoring

1 files changed, 11 insertions, 13 deletions

diff --git a/rhimport-sm b/rhimport-sm
index f48b809..d3f5beb 100755
--- a/rhimport-sm
+++ b/rhimport-sm
@@ -22,7 +22,6 @@
 #
 
 use strict;
-use DBI;
 use Date::Calc;
 use XML::Feed;
 use XML::Feed::Entry;
@@ -37,11 +36,6 @@ use LWP::Simple;
 use lib '/usr/local/share/rhimport/';
 use rhimport;
 
-my $DBHOST = "airplay";
-my $DBUSER = "rivendell";
-my $DBPW = "lldriven";
-my $DB = "rivendell";
-
 my $STAT_FILE = $ENV{'HOME'} . "/rhimport-sm.stat";
 my $RSS_URL = "http://cba.fro.at/seriesrss/263673?c=Kfs2IoV2Wmd";
 $XML::Feed::MULTIPLE_ENCLOSURES=1;
@@ -59,12 +53,16 @@ my $user = `/usr/bin/id -un`;
 $user =~ s/\n//;
 my $group = "soundsmove";
 
-my $dbh = DBI->connect("DBI:mysql:$DB:$DBHOST","$DBUSER","$DBPW") or die "Database Error: $DBI::errstr";
+my ($dbh, $errorstring) = rhimport::opendb();
+if(!defined $dbh) {
+  print "$errorstring\n";
+  exit 1;
+}
 my @allowed_dbs = rhimport::get_dropboxes($dbh, $user, $group);
 
 if(scalar(@allowed_dbs) != 1) {
   print "found more or less than one Dropbox for this group?!\n";
-  $dbh->disconnect();
+  rhimport::closedb($dbh);
   exit 1;
 }
 my $dropbox = $allowed_dbs[0]->{'PATH'};
@@ -78,7 +76,7 @@ if(($curweek != 1 && $curweek != 4) ||
    ($curweek == 1 && $dow > 3) ||
    ($curweek == 4 && $dow <= 3)) {
   print "File won't be available by now!\n";
-  $dbh->disconnect();
+  rhimport::closedb($dbh);
   exit 0;
 }
 print "today: " . Date::Calc::Date_to_Text(@today) . "\n";
@@ -100,7 +98,7 @@ print "day of latest original broadcast before next Radio Helsinki broadcast: "
 
 if(Date::Calc::Delta_Days(@broadcast_date, @today) <= 0) {
   print "File won't be available by now!\n";
-  $dbh->disconnect();
+  rhimport::closedb($dbh);
   exit 0;
 }
 
@@ -140,13 +138,13 @@ for my $entry ($feed->entries) {
       my ($current_id, $current_file) = $current_stat =~ m/^(.*)\n(.*)/;
       if($current_id eq $id  &&  $current_file eq $ff->output_file) {
         print "Already downloaded file of today\n";
-        $dbh->disconnect();
+        rhimport::closedb($dbh);
         exit 0;
       }
       $out_file = $ff->output_file;
       if(!rhimport::check_file_extension($out_file)) {
         print "\n\nThe extension of the matching file '". $out_file . "' seems to be wrong - manual import necessary!!!\n";
-        $dbh->disconnect();
+        rhimport::closedb($dbh);
         exit 1;
       }
 
@@ -192,7 +190,7 @@ my $import_log;
 ($ret, $import_log) = rhimport::import_single($file, $dropbox, $user, 0, $error_cb);
 $log .= $import_log;
 
-$dbh->disconnect();
+rhimport::closedb($dbh);
 
 unlink $file;