1 files changed, 11 insertions, 7 deletions
diff --git a/rhimport-dn b/rhimport-dn
index d1fe3e1..8362f4b 100755
--- a/rhimport-dn
+++ b/rhimport-dn
@@ -31,6 +31,7 @@ use XML::Feed::Enclosure;
 use URI::URL;
 use IO::Handle;
 use IPC::Open3;
+use RHRD::rddb;
 
 use lib '/usr/local/share/rhimport/';
 use rhimport;
@@ -58,13 +59,16 @@ my $user = `/usr/bin/id -un`;
 $user =~ s/\n//;
 my $group = "democracyn";
 
-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 = "";
 my $to_cart = 0;
@@ -94,7 +98,7 @@ for my $href ( @allowed_dbs ) {
 
 if($dropbox eq "") {
   print "no dropbox for day in question\n";
-  rhimport::closedb($dbh);
+  RHRD::rddb::closedb($dbh);
   exit 0;
 }
 
@@ -120,13 +124,13 @@ for my $entry ($files_feed->entries) {
       my $current_file = `cat $STAT_FILE`;
       if($current_file eq $path[-1]) {
         print "Already downloaded file of day in question\n";
-        rhimport::closedb($dbh);
+        RHRD::rddb::closedb($dbh);
         exit 0;
       }
       $out_file = $path[-1];
       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;
       }
 
@@ -217,7 +221,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;