switch to use systemwide RHRD perl module

1 files changed, 11 insertions, 6 deletions

diff --git a/rhimport-o94n b/rhimport-o94n
index f54fce1..2f1fcec 100755
--- a/rhimport-o94n
+++ b/rhimport-o94n
@@ -31,6 +31,7 @@ use File::Fetch;
 use IO::Handle;
 use IPC::Open3;
 use HTML::Entities;
+use RHRD::rddb;
 
 use lib '/usr/local/share/rhimport/';
 use rhimport;
@@ -52,12 +53,16 @@ my $user = `/usr/bin/id -un`;
 $user =~ s/\n//;
 my $group = "o94";
 
-my ($dbh, $errorstring) = rhimport::opendb();
+my ($dbh, $errorstring) = RHRD::rddb::opendb();
 if(!defined $dbh) {
   print "$errorstring\n";
   exit 1;
 }
-my @allowed_dbs = rhimport::get_dropboxes($dbh, $user, $group);
+my @allowed_dbs = RHRD::rddb::get_dropboxes($dbh, $user, $group);
+if(!defined $allowed_dbs[0] && defined $allowed_dbs[2]) {
+  print "$allowed_dbs[2]\n";
+  exit 1;
+}
 
 
 my $dropbox = '';
@@ -72,7 +77,7 @@ for my $db (@allowed_dbs) {
 }
 if($to_cart == 0) {
   print "no dropbox found for Tuesday?!\n";
-  rhimport::closedb($dbh);
+  RHRD::rddb::closedb($dbh);
   exit 1;
 }
 
@@ -134,13 +139,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";
-        rhimport::closedb($dbh);
+        RHRD::rddb::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";
-        rhimport::closedb($dbh);
+        RHRD::rddb::closedb($dbh);
         exit 1;
       }
 
@@ -186,7 +191,7 @@ my $import_log;
 ($ret, $import_log) = rhimport::import_single($file, $dropbox, $user, 0, $error_cb);
 $log .= $import_log;
 
-rhimport::closedb($dbh);
+RHRD::rddb::closedb($dbh);
 
 unlink $file;