import functions return rdimport logs now

git-svn-id: https://svn.helsinki.at/rhimport/trunk@40 7c65635b-ec39-4f67-a626-873dbafdd612

1 files changed, 6 insertions, 4 deletions

diff --git a/rhimport b/rhimport
index ce4463c..f431035 100755
--- a/rhimport
+++ b/rhimport
@@ -241,14 +241,15 @@ sub start_import_gui()
   $l_status->set_label("importiere von $file");
 
   my $ret;
+  my $log;
   if($POOL) {
     my $cb_clear_carts = $guixml->get_widget('cb_clear_carts');
     if($cb_clear_carts->get_active) {
       rhimport::clear_carts($dbh, $group, $to_cart, $gui_progress_cb);
     }
-    $ret = rhimport::import_playlist($file, $dropbox, $gui_progress_cb, $gui_error_cb);
+    ($ret, $log) = rhimport::import_playlist($file, $dropbox, $gui_progress_cb, $gui_error_cb);
   } else {
-    $ret = rhimport::import_single($file, $dropbox, $gui_progress_cb, $gui_error_cb);
+    ($ret, $log) = rhimport::import_single($file, $dropbox, $gui_progress_cb, $gui_error_cb);
   }
 
   if(!$ret) {
@@ -388,14 +389,15 @@ if($group eq '') {
 }
 
 my $ret;
+my $log;
 if($POOL) {
   if(!$KEEPCARTS) {
     rhimport::clear_carts($dbh, $group, $to_cart);
   }
 
-  $ret = rhimport::import_playlist($FILE, $DROPBOX, 0, $cl_error_cb);
+  ($ret, $log) = rhimport::import_playlist($FILE, $DROPBOX, 0, $cl_error_cb);
 } else {
-  $ret = rhimport::import_single($FILE, $DROPBOX, 0);
+  ($ret, $log) = rhimport::import_single($FILE, $DROPBOX, 0);
 }
 
 $dbh->disconnect();