bweb: Fix float usage for LIMIT sql query

diff --git a/gui/bweb/cgi/bfileview.pl b/gui/bweb/cgi/bfileview.pl
index d5bc6a2fe7ff48fa5d0d511aa03e5bfbbd5ff837..8282f278caeb8eacbfd8ee5fa69119c94f17be05 100755 (executable)
--- a/gui/bweb/cgi/bfileview.pl
+++ b/gui/bweb/cgi/bfileview.pl
@@ -370,6 +370,7 @@ sub fv_get_files_size
 sub fv_get_big_files
 {
     my ($jobid, $rep, $min, $limit) = @_;
+    $limit = int($limit);
 
     my $ret = $bweb->dbh_selectall_arrayref("
    SELECT FilenameId AS filenameid, Name AS name, size

diff --git a/gui/bweb/cgi/bresto.pl b/gui/bweb/cgi/bresto.pl
index 51c2bb0893f7fc37c8ac6d8de3996520446fc69d..a0b217cb42b96d47038c6cb7b6055d4cd3c961f0 100755 (executable)
--- a/gui/bweb/cgi/bresto.pl
+++ b/gui/bweb/cgi/bresto.pl
@@ -1103,10 +1103,9 @@ if ($action eq 'list_files_dirs') {
                                "'$jids'", # jobid
                                "'" . escape_quote($_->[1]) . "'", # name
                                "'" . $p[7] . "'",                 # size
-                               "'" . strftime('%Y-%m-%d %H:%m:%S', localtime($p[11])) .  "'") .
+                               "'" . strftime('%Y-%m-%d %H:%m:%S', localtime($p[11]||0)) .  "'") .
                    ']'; 
               } @$files);
-
     print "," if (@$files);
 
     $files = $bvfs->ls_dirs();
@@ -1120,7 +1119,7 @@ if ($action eq 'list_files_dirs') {
                                "'$jids'", # jobid
                                "'" . escape_quote($_->[1]) . "'", # name
                                "'" . $p[7] . "'",                 # size
-                               "'" . strftime('%Y-%m-%d %H:%m:%S', localtime($p[11])) .  "'") .
+                               "'" . strftime('%Y-%m-%d %H:%m:%S', localtime($p[11]||0)) .  "'") .
                    ']'; 
               } @$files);
 

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 6b9212cd9917b1aef1f04e441eb9ebd1723852de..d2123721436869751a240abb15ba23eef11ce87e 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -4670,17 +4670,20 @@ sub add_media
         $self->display($arg, 'add_media.tpl');
         return 1;
     }
-
-    my $cmd;
+    $b->connect();
+    $b->send("add pool=\"$arg->{pool}\" storage=\"$arg->{storage}\"\n");
     if ($arg->{nb} > 0) {
         $arg->{offset} = $arg->{offset}?$arg->{offset}:1; 
-        $cmd = "add pool=\"$arg->{pool}\" storage=\"$arg->{storage}\"\n$arg->{nb}\n$arg->{media}\n$arg->{offset}\n";
+        $b->send("$arg->{nb}\n");
+        $b->send("$arg->{media}\n");
+        $b->send("$arg->{offset}\n");
+
     } else {
-        $cmd = "add pool=\"$arg->{pool}\" storage=\"$arg->{storage}\"\n0\n$arg->{media}\n";
+        $b->send("0\n");
+        $b->send("$arg->{media}\n");
     }
-    $b->connect();
-    $b->send($cmd);
-    $b->expect_it('*');
+
+    $b->expect_it('-re','^[*]');
 
     CGI::param('media', '');
     CGI::param('re_media', $arg->{media});