--- trunk/lib/BackupPC/SearchLib.pm	2005/09/11 13:05:06	117
+++ trunk/lib/BackupPC/SearchLib.pm	2005/09/15 13:54:29	121
@@ -300,22 +300,19 @@
 sub getBackupsNotBurned() {
 
 	my $dbh = get_dbh();
+
 	my $sql = q{ 
-	SELECT
-		backups.hostID		AS hostid,
-		min(hosts.name)		AS host,
-		min(shares.name)	AS share,
-		backups.num		AS backupnum,
-		min(backups.type)	AS type,
-		min(backups.date)	AS date,
-		min(backups.size)	AS size
-	FROM files 
-		INNER JOIN shares	ON files.shareID=shares.ID
-		INNER JOIN hosts	ON hosts.ID = shares.hostID
-		INNER JOIN backups	ON backups.num = files.backupnum and backups.hostID = hosts.ID AND backups.shareID = shares.ID
-	GROUP BY 
-		backups.hostID, backups.num, backups.shareid
-	ORDER BY min(backups.date)
+		SELECT 
+			backups.hostID AS hostID,
+			hosts.name AS host,
+			shares.name AS share,
+			backups.id AS backupnum,
+			backups.type AS type,
+			backups.date AS date,
+			backups.size AS size
+		FROM backups 
+		WHERE id not in( select id from backups,archive_backup where archive_backup.backup_id=backups.id)
+		ORDER BY backups.date
 	};
 	my $sth = $dbh->prepare( $sql );
 	my @ret;
@@ -356,30 +353,52 @@
         }
       }
     }
+    
+    function sumiraj()
+    {
+    	var suma = 0;
+    	for (var i = 0; i < document.forma.elements.length; i++)    
+   		{
+   			var e = document.forma.elements[i];
+   			if ((e.checked || !e.checked) && e.name != \'all\')
+   			{
+				if (e.checked)
+				{
+					var ret = e.name.match("fcb(.*)");
+					suma += parseInt(eval("document.forma.fss"+ret[1]+".value"));
+					
+				}
+   			}
+    	}
+    	document.forma.totalsize.value = suma;
+    	return suma;
+    }
 //-->
 </script>      
 EOF3
 	$retHTML .= q{
-		<form name="forma" method="GET" action="$MyURL?action=burn">
-		<input type="hidden" value="burn" name="action">
-		<input type="hidden" value="results" name="search_results">
-		<table style="fview" border="0" cellspacing="0" cellpadding="2">
-		<tr class="tableheader">
-		<td class="tableheader">
-			<input type="checkbox" name="allFiles" onClick="checkAll('allFiles');">
-		</td>
-		<td align="center">Share</td>
-		<td align="center">Backup no</td>
-		<td align="center">Type</td>
-		<td align="center">date</td>
-		<td align="center">age/days</td>
-		<td align="center">size/MB</td>
-		<td align="center">gzip size</td>
-		</tr>
-
-		<tr><td colspan=7 style="tableheader">
-		<input type="submit" value="Burn selected backups on medium" name="submitBurner">
-		</td></tr>
+		<form name="forma" method="GET" action=};
+		$retHTML .= "\"".$MyURL."\"";
+		$retHTML .= q{?action=burn>
+			<input type="hidden" value="burn" name="action">
+			<input type="hidden" value="results" name="search_results">
+			<table style="fview" border="0" cellspacing="0" cellpadding="2">
+			<tr class="tableheader">
+			<td class="tableheader">
+				<input type="checkbox" name="allFiles" onClick="checkAll('allFiles');">
+			</td>
+			<td align="center">Share</td>
+			<td align="center">Backup no</td>
+			<td align="center">Type</td>
+			<td align="center">date</td>
+			<td align="center">age/days</td>
+			<td align="center">size/MB</td>
+			<td align="center">gzip size</td>
+			</tr>
+
+			<tr><td colspan=7 style="tableheader">
+			<input type="submit" value="Burn selected backups on medium" name="submitBurner">
+			</td></tr>
 	};
 
 	my @color = (' bgcolor="#e0e0e0"', '');
@@ -397,9 +416,9 @@
 	    
 		$retHTML .= "<tr" . $color[$i %2 ] . ">";
 		$retHTML .= '<td class="fview"><input type="checkbox" name="fcb' .
-				$backup->{'hostid'}.'_'.$backup->{'backupnum'} . 
-				'" value="' . $backup->{'hostid'}.'_'.$backup->{'backupnum'} .
-				'"></td>';
+											$backup->{'hostid'}.'_'.$backup->{'backupnum'} . 
+											'" value="' . $backup->{'hostid'}.'_'.$backup->{'backupnum'} .
+											'" onClick="sumiraj();"></td>';
 	    
 		$retHTML .=
 			'<td align="right">' . $backup->{'host'} . ':' . $backup->{'share'} . '</td>' .
@@ -408,13 +427,17 @@
 			'<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->{'fs_size'} .'</td>' .
+			'<td align="right">' . $backup->{'fs_size'} .
+			'<input type="hidden" name="fss'.$backup->{'hostid'}.'_'.$backup->{'backupnum'} . '"'.
+			'value="'. $backup->{'fs_size'} .'"'.'</td>' .
 			"</tr>\n";
 
 
 	}
 
 	$retHTML .= "</table>";
+	$retHTML .= "total gzip size:<input type=\"text\" name=\"totalsize\"><br>";
+	$retHTML .= "Note:<input type=\"text\" name=\"note\">";
 	$retHTML .= "</form>";
       
 	return $retHTML;