Index: trunk/DataStoreServer/scripts/tabledefs.sql
===================================================================
--- trunk/DataStoreServer/scripts/tabledefs.sql	(revision 16762)
+++ trunk/DataStoreServer/scripts/tabledefs.sql	(revision 16872)
@@ -5,7 +5,5 @@
 
 #
-# TODO: arguably we should put prod_col_n in another table, but since the
-# number of products will be small, it is simpler to just keep them here
-#
+# 
 
 CREATE TABLE dsProduct (
@@ -16,7 +14,6 @@
     type        VARCHAR(64),
     description VARCHAR(255),
-    path_name   VARCHAR(255),
-    prod_col_0  VARCHAR(64),        # names of product specific columns
-    prod_col_1  VARCHAR(64),        # shows up in the header list
+    prod_col_0  VARCHAR(64),        # labels for product specific columns
+    prod_col_1  VARCHAR(64),        # these appear in the header list
     prod_col_2  VARCHAR(64),
     prod_col_3  VARCHAR(64),
@@ -31,5 +28,5 @@
     prod_id     BIGINT(20),
     fileset_id  BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    fileset_name VARCHAR(64) NOT NULL UNIQUE,
+    fileset_name VARCHAR(64) NOT NULL,
     reg_time    datetime NOT NULL,
     type        VARCHAR(64),
@@ -65,7 +62,5 @@
 
 #
-# names of the type specific columns for a data store file type
-# 
-# if not null, the cols will show up in the indexes
+# labels for the type specific columns for each Data Store file type
 #
 
@@ -78,35 +73,9 @@
 ) Engine=InnoDB DEFAULT CHARSET=latin1;
 
-# type specific columns for type chip
+# type specific column for type chip
 INSERT INTO dsFileType (type, type_col_0) VALUES('chip', 'chipname');
+
+# none of these types have any type specific columns
 INSERT INTO dsFileType (type) VALUES('psrequest');
 INSERT INTO dsFileType (type) VALUES('psresults');
 INSERT INTO dsFileType (type) VALUES('pstamp');
-
-INSERT INTO dsProduct (prod_id, prod_name, last_update, last_fs, type, description, path_name)
-        VALUES (0, 'pstamprequest', UTC_TIMESTAMP(), NULL, 'psrequest', 'Postage Stamp Request',
-        '/var/www/html/ds/dsroot');
-
-INSERT INTO dsProduct (prod_id, prod_name, last_update, last_fs, type, description, path_name)
-        VALUES (0, 'sample', UTC_TIMESTAMP(), NULL, 'psresult', 'Postage Stamp Request', '/var/www/html/ds/dsroot');
-
-#
-# the width of the product specific column header strings should match the usual width of the columns
-# to make the fileset lists look neat (note 'telescope pointing') 
-#
-
-INSERT INTO dsProduct VALUES (0, 'gpc1', UTC_TIMESTAMP(), NULL, 'image',
-        'Gigapixel Camera 1', '/var/www/html/ds/dsroot', 'telescope pointing        ', 'etime', 'f',
-        'airm', 'comments', NULL, NULL, NULL);
-
-INSERT INTO dsFileset VALUES(1, 0, 'fileset1', UTC_TIMESTAMP(), 'PSTAMP');
-INSERT INTO dsFileset VALUES(1, 0, 'fileset2', UTC_TIMESTAMP(), 'PSTAMP');
-INSERT INTO dsFileset VALUES(1, 0, 'fileset13', UTC_TIMESTAMP(), 'PSTAMP');
-
-INSERT INTO dsFile VALUES(LAST_INSERT_ID(), 0, 'fileset13.fits', 8640, 'b8217dcb393de3af02d915d77025021d',
-    'psrequest');
-
-    
-
-
-