Fixed regression where invalid entries where inserted in the inventory

Signed-off-by: Marcelo Lacerda <msl09@c3sl.ufpr.br>

database/load/002-dim_inventory.sql

@@ -35,7 +35,8 @@ BEGIN
 		 s.disk2_model = d.disk2_model  AND
 		 s.disk2_size >= d.disk2_size * 0.9 AND
 		 s.disk2_size <= d.disk2_size * 1.1 AND
-		 s.disk2_used  = d.disk2_used) LOOP
+		 s.disk2_used  = d.disk2_used)
+		 WHERE valid = '1' LOOP
 
 
 		-- IF .... THEN

database/load/003-fact_contact.sql

@@ -16,7 +16,7 @@ BEGIN
 
 	-- 
 	INSERT INTO fact_contact (sch_id, cit_id, dat_id, macaddr)
-	(SELECT sch_id, cit_id, contact_date, macaddr::macaddr FROM sa_inventory)
+	(SELECT sch_id, cit_id, contact_date, macaddr::macaddr FROM sa_inventory WHERE valid = '1')
 	EXCEPT
 	(SELECT sch_id, cit_id, dat_id, macaddr FROM fact_contact WHERE dat_id >= result.min_date AND dat_id <= result.max_date);