r11655@llin: dpavlin | 2005-12-13 00:23:11 +0100

 various improvements and fixes. Might even work now.

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@262 8392b6e1-25fa-0310-8288-cc32f8e212ea

diff --git a/lib/BackupPC/SearchLib.pm b/lib/BackupPC/SearchLib.pm
index d1485c9..ebc9697 100644 (file)
--- a/lib/BackupPC/SearchLib.pm
+++ b/lib/BackupPC/SearchLib.pm
@@ -507,7 +507,7 @@ print STDERR "## sort=". ($param->{'sort'} || 'no sort param') . " burn sql orde
                $row->{size} = sprintf("%0.2f", $row->{size} / 1024 / 1024);
 
                # do some cluster calculation (approximate)
-               $row->{inc_size} = int(($row->{inc_size} + 1023 ) / ( 2 * 1024 ) * 2);
+               $row->{inc_size} = int(( ($row->{inc_size} + 1023 ) / 2 )  * 2);
                $row->{inc_size_calc} ||= $row->{inc_size};
                push @ret, $row;
        }
@@ -654,7 +654,7 @@ var max_file_size = $max_archive_file_size;
        $retHTML .= <<'EOF3';
 
 function debug(msg) {
-       return; // Disable debugging
+//     return; // Disable debugging
 
        if (! debug_div) debug_div = document.getElementById('debug');
 
@@ -719,39 +719,44 @@ function update_sum(suma, suma_disp) {
        debug('total size: ' + suma);
 }
 
-function sumiraj(e) {
-       var suma = parseInt(element_id('forma').elements['totalsize'].value) || 0;
-       var len = element_id('forma').elements.length;
-       if (e) {
-               var size = parseInt( element_id("fss" + e.name.substr(3)).value);
-               if (e.checked) {
-                       suma += size;
+function update_size(name, checked, suma) {
+       var size = parseInt( element_id("fss" + name).value);
+
+       if (checked) {
+               suma += size;
+       } else {
+               suma -= size;
+       }
+
+       var volumes = parseInt( element_id("prt" + name).value);
+       debug('update_size('+name+','+checked+') suma: '+suma+' volumes: '+volumes);
+       if (volumes > 1) {
+               if (checked) {
+                       element_id("volumes").innerHTML = "This will take "+volumes+" mediums!";
+                       element_id("volumes").style.display = 'block';
+                       suma = size;
+                       update_sum(suma);
                } else {
                        suma -= size;
+                       element_id("volumes").style.display = 'none';
                }
+       }
 
-               var volumes = parseInt( element_id("prt" + e.name.substr(3)).value);
-               if (volumes > 1) {
-                       if (e.checked) {
-                               element_id("volumes").innerHTML = "This will take "+volumes+" mediums!";
-                               element_id("volumes").style.display = 'block';
-                               suma = size;
-                               update_sum(suma);
-                               return suma;
-                       } else {
-                               suma -= size;
-                               element_id("volumes").style.display = 'none';
-                       }
-               }
+       return suma;
+}
 
+function sumiraj(e) {
+       var suma = parseInt(element_id('forma').elements['totalsize'].value) || 0;
+       var len = element_id('forma').elements.length;
+       if (e) {
+               suma = update_size(e.name.substr(3), e.checked, suma);
                if (suma < 0) suma = 0;
        } else {
                suma = 0;
                for (var i = 0; i < len; i++) {
-                       var e = element_id('forma').elements[i];
-                       if (e.name != 'all' && e.checked && e.name.substr(0,3) == 'fcb') {
-                               var el = element_id("fss" + e.name.substr(3));
-                               if (el && el.value) suma += parseInt(el.value) || 0;
+                       var fel = element_id('forma').elements[i];
+                       if (fel.name != 'all' && fel.checked && fel.name.substr(0,3) == 'fcb') {
+                               suma = update_size(fel.name.substr(3), fel.checked, suma);
                        }
                }
        }
@@ -851,11 +856,9 @@ Note:
 <input type="submit" id="submitBurner" value="Burn selected" name="submitBurner" />
 
 </div>
-<!--
 <div id="debug" style="float: right; width: 10em; border: 1px #ff0000 solid; background-color: #ffe0e0; -moz-opacity: 0.7;">
 no debug output yet
 </div>
--->
 EOF3
        $retHTML .= q{
                        <input type="hidden" value="burn" name="action">
@@ -913,7 +916,7 @@ EOF3
                        '<td align="center">' . epoch_to_iso( $backup->{'date'} ) . '</td>' .
                        '<td align="center">' . $backup->{'age'} . '</td>' .
                        '<td align="right">' . $backup->{'size'} . '</td>' .
-                       '<td align="right">' . $backup->{'inc_size'} .
+                       '<td align="right">' . sprintf("%0.1f", $backup->{'inc_size'} / 1024 ) .
                        '<input type="hidden" id="fss'.$checkbox_key .'" value="'. $backup->{'inc_size_calc'} .'"></td>' .
                        '<input type="hidden" id="prt'.$checkbox_key .'" value="'. $backup->{'volumes'} .'"></td>' .
                        '<td align="left">' . ( qq{<img src="$img_url/icon-cd.gif" alt="media">} x $backup->{volumes} ) . '</td>' .