support status

git-svn-id: file:///var/svn/portage@60 3218660a-b0cf-4799-a991-8ddcc5b9e0f3

1 files changed, 28 insertions, 28 deletions

diff --git a/import.ebuild_mask.php b/import.ebuild_mask.php
index 9a2ac29..7aeeb33 100644
--- a/import.ebuild_mask.php
+++ b/import.ebuild_mask.php
@@ -11,36 +11,36 @@
 	require_once 'class.portage.package.php';
 	require_once 'class.portage.ebuild.php';
 	
-	$sql = "SELECT COUNT(1) FROM package_mask WHERE status = 1;";
-	$count = $db->getOne($sql);
+	// Reset old entries that were new
+	$sql = "DELETE FROM ebuild_mask WHERE status = 1;";
+	$db->query($sql);
 	
-	if($count) {
+	// Insert entries where the entire package is masked
+	$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE e.status = 1 AND pm.pvr = '' AND lt = FALSE AND gt = FALSE AND eq = FALSE AND ar = FALSE AND av = FALSE;";
+	$db->query($sql);
 	
-		// Insert entries where the entire package is masked
-		$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE pm.pvr = '' AND lt = FALSE AND gt = FALSE AND eq = FALSE AND ar = FALSE AND av = FALSE;";
-		$db->query($sql);
-		
-		// Insert entries where it's an exact package and version
-		$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE pm.pvr = e.pvr AND lt = FALSE AND gt = FALSE AND eq = TRUE AND ar = FALSE AND av = FALSE;";
-		$db->query($sql);
-		
-		// Insert entries where atom is like:
-		// =media-video/mplayer-1.0*
-		// Specifically IGNORE gt and lt
-		$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE e.pvr LIKE (pm.pvr || '%') AND eq = TRUE AND ar = FALSE AND av = TRUE;";
-		$db->query($sql);
-		
-		// Insert entries where atom is like:
-		// ~media-video/mplayer-1.0
-		$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE pm.pvr = e.version AND lt = FALSE AND gt = FALSE AND eq = FALSE AND ar = TRUE AND av = FALSE;";
-		$db->query($sql);
-		
-		// All others
-		$sql = "SELECT pm.id AS pm_id, pm.package, pm.atom, pm.version AS pm_version, pm.gt, pm.lt, pm.eq, pl.level AS pm_level, e.version AS ebuild_version, el.level AS ebuild_level, e.id AS ebuild FROM package_mask pm INNER JOIN view_pmask_level pl ON pl.id = pm.id INNER JOIN ebuild e ON e.package = pm.package INNER JOIN view_ebuild_level el ON el.id = e.id WHERE pm.gt = TRUE OR pm.lt = TRUE ORDER BY pm.gt, pm.eq, pm.package;";
-	// 	shell::msg($sql);
-		
-		$arr = $db->getAll($sql);
-		
+	// Insert entries where it's an exact package and version
+	$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE e.status = 1 AND pm.pvr = e.pvr AND lt = FALSE AND gt = FALSE AND eq = TRUE AND ar = FALSE AND av = FALSE;";
+	$db->query($sql);
+	
+	// Insert entries where atom is like:
+	// =media-video/mplayer-1.0*
+	// Specifically IGNORE gt and lt
+	$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE e.status = 1 AND e.pvr LIKE (pm.pvr || '%') AND eq = TRUE AND ar = FALSE AND av = TRUE;";
+	$db->query($sql);
+	
+	// Insert entries where atom is like:
+	// ~media-video/mplayer-1.0
+	$sql = "INSERT INTO ebuild_mask SELECT pm.id, e.id, 1 FROM ebuild e INNER JOIN package p ON e.package = p.id INNER JOIN package_mask pm ON pm.package = e.package WHERE e.status = 1 AND pm.pvr = e.version AND lt = FALSE AND gt = FALSE AND eq = FALSE AND ar = TRUE AND av = FALSE;";
+	$db->query($sql);
+	
+	// All others
+	$sql = "SELECT pm.id AS pm_id, pm.package, pm.atom, pm.version AS pm_version, pm.gt, pm.lt, pm.eq, pl.level AS pm_level, e.version AS ebuild_version, el.level AS ebuild_level, e.id AS ebuild FROM package_mask pm INNER JOIN view_pmask_level pl ON pl.id = pm.id INNER JOIN ebuild e ON e.package = pm.package INNER JOIN view_ebuild_level el ON el.id = e.id WHERE e.status = 1 AND (pm.gt = TRUE OR pm.lt = TRUE) ORDER BY pm.gt, pm.eq, pm.package;";
+//  	shell::msg($sql);
+	
+	$arr = $db->getAll($sql);
+	
+	if(count($arr)) {
 		foreach($arr as $row) {
 		
 			extract($row);