switch to use systemwide RHRD perl module

1 files changed, 11 insertions, 6 deletions

diff --git a/rhimport-zfw b/rhimport-zfw
index 5a534bf..a04e249 100755
--- a/rhimport-zfw
+++ b/rhimport-zfw
@@ -32,6 +32,7 @@ use File::Fetch;
 use IO::Handle;
 use IPC::Open3;
 use HTML::Entities;
+use RHRD::rddb;
 
 use lib '/usr/local/share/rhimport/';
 use rhimport;
@@ -53,16 +54,20 @@ my $user = `/usr/bin/id -un`;
 $user =~ s/\n//;
 my $group = "zipfmwla";
 
-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;
+}
 
 if(scalar(@allowed_dbs) != 1) {
   print "found no or more than one Dropboxes for this group?!\n";
-  rhimport::closedb($dbh);
+  RHRD::rddb::closedb($dbh);
   exit 1;
 }
 my $dropbox = $allowed_dbs[0]->{'PATH'};
@@ -120,13 +125,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";
-        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;
       }
 
@@ -172,7 +177,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;