refactoring

1 files changed, 10 insertions, 12 deletions

diff --git a/rhimport-fe b/rhimport-fe
index fbcaca1..266708a 100755
--- a/rhimport-fe
+++ b/rhimport-fe
@@ -22,7 +22,6 @@
 #
 
 use strict;
-use DBI;
 use Date::Calc;
 use XML::Feed;
 use XML::Feed::Entry;
@@ -37,11 +36,6 @@ use File::Touch;
 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-fe.stat";
 my $NOTE_FILE = $ENV{'HOME'} . "/rhimport-fe.last_note";
 my $NEW_FILE = $ENV{'HOME'} . "/rhimport-fe.is_new";
@@ -84,19 +78,23 @@ $group .= "Mi" if($dow == 3);
 $group .= "Do" if($dow == 4);
 $group .= "Fr" if($dow == 5);
 
-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);
 my $dropbox = "";
 my $to_cart = 0;
 
 if(scalar(@allowed_dbs) == 0) {
   print "no dropbox for day in question\n";
-  $dbh->disconnect();
+  rhimport::closedb($dbh);
   exit 0;
 }
 if(scalar(@allowed_dbs) != 1) {
   print "found more or less than one Dropbox for this group?!\n";
-  $dbh->disconnect();
+  rhimport::closedb($dbh);
   exit 1;
 }
 $dropbox = $allowed_dbs[0]->{'PATH'};
@@ -123,13 +121,13 @@ for my $entry ($feed->entries) {
     my $current_file = `cat $STAT_FILE`;
     if($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;
     }
 
@@ -182,7 +180,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;