Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 25479)
+++ trunk/ippTools/share/Makefile.am	(revision 25493)
@@ -110,4 +110,6 @@
      disttool_definebyquery_stack.sql \
      disttool_definebyquery_warp.sql \
+     disttool_defineinterest.sql \
+     disttool_listinterest.sql \
      disttool_pending_camera.sql \
      disttool_pending_chip.sql \
@@ -122,6 +124,6 @@
      disttool_queuercrun.sql \
      disttool_revertrcrun.sql \
-     disttool_revertrun_update.sql \
-     disttool_revertrun_delete.sql \
+     disttool_revertrun.sql \
+     disttool_revertcomponent.sql \
      disttool_revertfileset.sql \
      disttool_toadvance.sql \
Index: trunk/ippTools/share/disttool_defineinterest.sql
===================================================================
--- trunk/ippTools/share/disttool_defineinterest.sql	(revision 25493)
+++ trunk/ippTools/share/disttool_defineinterest.sql	(revision 25493)
@@ -0,0 +1,6 @@
+INSERT INTO rcInterest
+    SELECT 0, dest_id, target_id, '@STATE@'
+    FROM distTarget
+        JOIN rcDestination
+        LEFT JOIN rcInterest USING(dest_id, target_id)
+    WHERE (int_id IS NULL)
Index: trunk/ippTools/share/disttool_listinterest.sql
===================================================================
--- trunk/ippTools/share/disttool_listinterest.sql	(revision 25493)
+++ trunk/ippTools/share/disttool_listinterest.sql	(revision 25493)
@@ -0,0 +1,13 @@
+SELECT 
+    int_id,
+    rcInterest.state AS state,
+    dest_id,
+    name AS dest_name,
+    rcDestination.state as dest_state,
+    label,
+    filter,
+    stage,
+    distTarget.state as target_state
+FROM rcInterest 
+    JOIN distTarget USING(target_id)
+    JOIN rcDestination USING(dest_id)
Index: trunk/ippTools/share/disttool_pendingfileset.sql
===================================================================
--- trunk/ippTools/share/disttool_pendingfileset.sql	(revision 25479)
+++ trunk/ippTools/share/disttool_pendingfileset.sql	(revision 25493)
@@ -5,14 +5,13 @@
     stage_id,
     CONCAT_WS('.', distRun.outroot, CONVERT(distRun.dist_id, CHAR)) as dist_dir,
-    rcDSProduct.name AS product_name,
-    rcDSProduct.prod_id,
-    rcDSProduct.dbname AS ds_dbname,
-    rcDSProduct.dbhost AS ds_dbhost
+    rcDestination.name AS product_name,
+    rcDestination.prod_id,
+    rcDestination.dbname AS ds_dbname,
+    rcDestination.dbhost AS ds_dbhost
 FROM rcDestination 
 JOIN rcInterest USING(dest_id) 
 JOIN distTarget USING(target_id) 
-JOIN rcDSProduct USING(prod_id)
 JOIN distRun USING(target_id) 
-LEFT JOIN rcDSFileset USING(prod_id, dist_id)
+LEFT JOIN rcDSFileset USING(dest_id, dist_id)
 WHERE distRun.state = 'full'
     AND rcDestination.state = 'enabled'
Index: trunk/ippTools/share/disttool_queuercrun.sql
===================================================================
--- trunk/ippTools/share/disttool_queuercrun.sql	(revision 25479)
+++ trunk/ippTools/share/disttool_queuercrun.sql	(revision 25493)
@@ -13,7 +13,6 @@
 JOIN rcInterest USING(dest_id) 
 JOIN distTarget USING(target_id) 
-JOIN rcDSProduct USING(prod_id)
 JOIN distRun USING(target_id, stage) 
-JOIN rcDSFileset USING(prod_id, dist_id)
+JOIN rcDSFileset USING(dest_id, dist_id)
 LEFT JOIN rcRun using(fs_id, dest_id)
 WHERE rcRun.rc_id IS NULL
Index: trunk/ippTools/share/disttool_revertcomponent.sql
===================================================================
--- trunk/ippTools/share/disttool_revertcomponent.sql	(revision 25493)
+++ trunk/ippTools/share/disttool_revertcomponent.sql	(revision 25493)
@@ -0,0 +1,5 @@
+DELETE FROM distComponent
+USING distComponent, distRun
+WHERE distComponent.dist_id = distRun.dist_id
+    AND distRun.state = 'new'
+    AND distComponent.fault != 0
Index: trunk/ippTools/share/disttool_revertrun.sql
===================================================================
--- trunk/ippTools/share/disttool_revertrun.sql	(revision 25493)
+++ trunk/ippTools/share/disttool_revertrun.sql	(revision 25493)
@@ -0,0 +1,4 @@
+UPDATE distRun
+SET distRun.fault = 0
+WHERE distRun.state = 'new'
+    AND distRun.fault != 0
Index: trunk/ippTools/share/disttool_revertrun_delete.sql
===================================================================
--- trunk/ippTools/share/disttool_revertrun_delete.sql	(revision 25479)
+++ 	(revision )
@@ -1,5 +1,0 @@
-DELETE FROM distComponent
-USING distComponent, distRun
-WHERE distComponent.dist_id = distRun.dist_id
-    AND distRun.state = 'new'
-    AND distComponent.fault != 0
Index: trunk/ippTools/share/disttool_revertrun_update.sql
===================================================================
--- trunk/ippTools/share/disttool_revertrun_update.sql	(revision 25479)
+++ 	(revision )
@@ -1,4 +1,0 @@
-UPDATE distRun
-SET distRun.fault = 0
-WHERE distRun.state = 'new'
-    AND distRun.fault != 0
Index: trunk/ippTools/share/disttool_updatercrun.sql
===================================================================
--- trunk/ippTools/share/disttool_updatercrun.sql	(revision 25479)
+++ trunk/ippTools/share/disttool_updatercrun.sql	(revision 25493)
@@ -1,6 +1,5 @@
 UPDATE rcRun
 JOIN rcDestination USING(dest_id)
-JOIN rcDSProduct USING(prod_id) 
-JOIN rcDSFileset using(prod_id, fs_id)
+JOIN rcDSFileset using(dest_id, fs_id)
 SET
     -- set hook %s
Index: trunk/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- trunk/ippTools/share/pxadmin_create_tables.sql	(revision 25479)
+++ trunk/ippTools/share/pxadmin_create_tables.sql	(revision 25493)
@@ -1232,4 +1232,5 @@
         name VARCHAR(64) UNIQUE,
         reqType VARCHAR(16),
+        label VARCHAR(64),
         outProduct VARCHAR(64),
         uri VARCHAR(255),
@@ -1297,24 +1298,15 @@
 
 
-CREATE TABLE rcDSProduct (
-    prod_id     BIGINT AUTO_INCREMENT,
-    name        VARCHAR(64),
-    dbname      VARCHAR(64),
-    dbhost      VARCHAR(64),
-    PRIMARY KEY(prod_id)
-)  ENGINE=innodb DEFAULT CHARSET=latin1;
-
 CREATE TABLE rcDestination (
     dest_id     BIGINT AUTO_INCREMENT,
-    prod_id     BIGINT,
     name        VARCHAR(64),
     status_uri  VARCHAR(255),
     comment     VARCHAR(255),
     last_fileset VARCHAR(255),
+    dbname      VARCHAR(64),
+    dbhost      VARCHAR(64),
     state       VARCHAR(64),
-    PRIMARY KEY(dest_id),
-    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
+    PRIMARY KEY(dest_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
-
 
 CREATE TABLE rcInterest (
@@ -1332,14 +1324,13 @@
     fs_id       BIGINT AUTO_INCREMENT,
     dist_id     BIGINT,
-    prod_id     BIGINT,
+    dest_id     BIGINT,
     name        VARCHAR(255),
     state       VARCHAR(64),
     registered  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     fault       SMALLINT DEFAULT 0,
-    PRIMARY KEY(dist_id, prod_id),
+    PRIMARY KEY(dist_id, dest_id),
     KEY(fs_id),
     FOREIGN KEY(dist_id) REFERENCES distRun(dist_id),
-    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
---    KEY(dist_id, prod_id)
+    FOREIGN KEY(dest_id) REFERENCES rcDestination(dest_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
 
Index: trunk/ippTools/share/rcserver_updatercrun.sql
===================================================================
--- trunk/ippTools/share/rcserver_updatercrun.sql	(revision 25479)
+++ trunk/ippTools/share/rcserver_updatercrun.sql	(revision 25493)
@@ -1,9 +1,4 @@
 UPDATE rcRun
 JOIN rcDestination USING(dest_id)
-JOIN rcDSProduct USING(prod_id) 
-JOIN rcDSFileset using(prod_id, fs_id)
+JOIN rcDSFileset using(dest_id, fs_id)
 SET
-rcRun.fault= 42, rcDestination.last_fileset = 'o4741g0236o.chip.14519.33.1'
-
-
-