Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 23880)
+++ trunk/ippTools/share/Makefile.am	(revision 23885)
@@ -171,5 +171,6 @@
      pztool_revertcopied.sql \
      receivetool_list.sql \
-     receivetool_pendingrun.sql \
+     receivetool_pendingfileset.sql \
+     receivetool_pendingfile.sql \
      receivetool_revert.sql \
      regtool_create_dup_table.sql \
Index: trunk/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- trunk/ippTools/share/pxadmin_create_tables.sql	(revision 23880)
+++ trunk/ippTools/share/pxadmin_create_tables.sql	(revision 23885)
@@ -1317,23 +1317,33 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
--- Run for receiving files
-CREATE TABLE receiveRun (
-    receive_id BIGINT AUTO_INCREMENT, -- unique identifier
+-- Filesets to receive
+CREATE TABLE receiveFileset (
+    fileset_id BIGINT AUTO_INCREMENT, -- unique identifier
     source_id BIGINT NOT NULL,  -- link to receiveSource
     fileset VARCHAR(128) NOT NULL, -- fileset to receive
-    PRIMARY KEY(receive_id),
+    PRIMARY KEY(fileset_id),
     KEY(source_id),
     FOREIGN KEY(source_id) REFERENCES receiveSource(source_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+-- Files to receive
+CREATE TABLE receiveFile (
+    file_id BIGINT AUTO_INCREMENT, -- unique identifier
+    fileset_id BIGINT NOT NULL,  -- link to receiveFileset
+    file VARCHAR(128) NOT NULL, -- file to receive
+    PRIMARY KEY(file_id),
+    KEY(fileset_id),
+    FOREIGN KEY(fileset_id) REFERENCES receiveFileset(fileset_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 -- Result of receiving files
 CREATE TABLE receiveResult (
-    receive_id BIGINT AUTO_INCREMENT, -- unique identifier, link to receiveRun
+    file_id BIGINT AUTO_INCREMENT, -- link to receiveFile
     dtime_copy FLOAT,           -- Time to copy
     dtime_extract FLOAT,        -- Time to extract
     fault SMALLINT NOT NULL DEFAULT 0, -- Fault code
-    PRIMARY KEY(receive_id),
-    KEY(fault),
-    FOREIGN KEY(receive_id) REFERENCES receiveRun(receive_id)
+    PRIMARY KEY(file_id),
+    KEY(fault),
+    FOREIGN KEY(file_id) REFERENCES receiveFile(file_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
Index: trunk/ippTools/share/receivetool_pendingfile.sql
===================================================================
--- trunk/ippTools/share/receivetool_pendingfile.sql	(revision 23885)
+++ trunk/ippTools/share/receivetool_pendingfile.sql	(revision 23885)
@@ -0,0 +1,6 @@
+SELECT *
+FROM receiveFile
+JOIN receiveFileset USING(fileset_id)
+JOIN receiveSource USING(source_id)
+LEFT JOIN receiveResult USING(file_id)
+WHERE receiveFile.file_id IS NULL
Index: trunk/ippTools/share/receivetool_pendingfileset.sql
===================================================================
--- trunk/ippTools/share/receivetool_pendingfileset.sql	(revision 23885)
+++ trunk/ippTools/share/receivetool_pendingfileset.sql	(revision 23885)
@@ -0,0 +1,5 @@
+SELECT *
+FROM receiveFileset
+JOIN receiveSource USING(source_id)
+LEFT JOIN receiveFile USING(fileset_id)
+WHERE receiveFile.fileset_id IS NULL
Index: trunk/ippTools/share/receivetool_pendingrun.sql
===================================================================
--- trunk/ippTools/share/receivetool_pendingrun.sql	(revision 23880)
+++ 	(revision )
@@ -1,5 +1,0 @@
-SELECT *
-FROM receiveRun
-JOIN receiveSource USING(source_id)
-LEFT JOIN receiveResult USING(receive_id)
-WHERE receiveResult.receive_id IS NULL
Index: trunk/ippTools/share/receivetool_revert.sql
===================================================================
--- trunk/ippTools/share/receivetool_revert.sql	(revision 23880)
+++ trunk/ippTools/share/receivetool_revert.sql	(revision 23885)
@@ -1,5 +1,6 @@
 DELETE FROM receiveResult
-USING receiveResult, receiveRun, receiveSource
-WHERE receiveResult.receive_id = receiveRun.receive_id
-    AND receiveRun.source_id = receiveSource.source_id
+USING receiveResult, receiveFile, receiveFileset, receiveSource
+WHERE receiveResult.file_id = receiveFile.file_id
+    AND receiveFile.fileset_id = receiveFileset.fileset_id
+    AND receiveFileset.source_id = receiveSource.source_id
     AND fault != 0