summaryrefslogtreecommitdiff
path: root/rhimport-nw
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2015-07-24 19:01:55 (GMT)
committerChristian Pointner <equinox@helsinki.at>2015-07-24 19:01:55 (GMT)
commit6761a44cfb25af3f923a53375f05e75e8570403d (patch)
tree5bb59562bae08a0edf8ea71c62d89f635b6213a7 /rhimport-nw
parentd9df4264e66e6091538ab24c41fad20131526460 (diff)
switch to use systemwide RHRD perl module
Diffstat (limited to 'rhimport-nw')
-rwxr-xr-xrhimport-nw17
1 files changed, 11 insertions, 6 deletions
diff --git a/rhimport-nw b/rhimport-nw
index 7d90c0b..8adea51 100755
--- a/rhimport-nw
+++ b/rhimport-nw
@@ -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,16 +53,20 @@ my $user = `/usr/bin/id -un`;
$user =~ s/\n//;
my $group = "netwatcher";
-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 more or less than 1 Dropbox for this group?!\n";
- rhimport::closedb($dbh);
+ RHRD::rddb::closedb($dbh);
exit 1;
}
my $dropbox = $allowed_dbs[0]->{'PATH'};
@@ -115,13 +120,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;
}
@@ -167,7 +172,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;