Index: /trunk/dbconfig/tasks.md
===================================================================
--- /trunk/dbconfig/tasks.md	(revision 6320)
+++ /trunk/dbconfig/tasks.md	(revision 6321)
@@ -1,19 +1,16 @@
-# $Id: tasks.md,v 1.19 2006-02-02 04:27:14 jhoblitt Exp $
+# $Id: tasks.md,v 1.20 2006-02-03 21:13:25 jhoblitt Exp $
 
 newExp METADATA
     exp_id      STR         255     # Primary Key
     camera      STR         255
-    exp_type     STR         255
-    filter      STR         255
+    telescope   STR         255
+    exp_type    STR         255
     class       STR         255
-    nclass      S32         0
-    stats       STR         255
+    imfiles     S32         0
 END
 
 newImfile METADATA
     exp_id      STR         255     # Key
-    class       STR         255
     class_id    STR         255
-    stats       STR         255
     url         STR         255
 END
@@ -23,8 +20,9 @@
     exp_id      STR         255     # Primary Key
     camera      STR         255
-    exp_type     STR         255
+    telescope   STR         255
+    exp_type    STR         255
+    class       STR         255
+    imfiles     S32         0
     filter      STR         255
-    class       STR         255
-    nclass      S32         0
     stats       STR         255
 END
@@ -34,8 +32,9 @@
     exp_id      STR         255     # Primary Key
     camera      STR         255
-    exp_type     STR         255
+    telescope   STR         255
+    exp_type    STR         255
+    class       STR         255
+    imfiles     S32         0
     filter      STR         255
-    class       STR         255
-    nclass      S32         0
     stats       STR         255
 END
@@ -43,14 +42,7 @@
 rawImfile METADATA
     exp_id      STR         255     # Key
-    class       STR         255
     class_id    STR         255
+    url         STR         255
     stats       STR         255
-    url         STR         255
-END
-
-# needed to decide to queue as p1/2 pending
-p0CameraConfig  METADATA
-    camera      STR         255     # Primary key
-    phase       S32         0
 END
 
@@ -58,9 +50,11 @@
     exp_id      STR         255     # Primary Key
     camera      STR         255
-    exp_type     STR         255
+    telescope   STR         255
+    exp_type    STR         255
+    class       STR         255
+    imfiles     S32         0
     filter      STR         255
-    class       STR         255
-    nclass      S32         0
     stats       STR         255
+    recipe      STR         64
     p1_version  S32         0
 END
@@ -72,9 +66,11 @@
     exp_id      STR         255     # Primary Key
     camera      STR         255
-    exp_type     STR         255
+    telescope   STR         255
+    exp_type    STR         255
+    class       STR         255
+    imfiles     S32         0
     filter      STR         255
-    class       STR         255
-    nclass      S32         0
     stats       STR         255
+    recipe      STR         64
     p1_version  S32         0
     p2_version  S32         0
@@ -85,11 +81,10 @@
 p2PendingImfile METADATA
     exp_id      STR         255     # Key
-    class       STR         255
     class_id    STR         255
+    url         STR         255
+    stats       STR         255
+    recipe      STR         64
     p1_version  S32         0
     p2_version  S32         0
-    recipe      STR         64
-    stats       STR         255
-    url         STR         255
 END
 
@@ -100,9 +95,11 @@
     exp_id      STR         255     # Primary Key
     camera      STR         255
-    exp_type     STR         255
+    telescope   STR         255
+    exp_type    STR         255
+    class       STR         255
+    imfiles     S32         0
     filter      STR         255
-    class       STR         255
-    nclass      S32         0
-    ndone       S32         0    
+    stats       STR         255
+    recipe      STR         64
     p1_version  S32         0
     p2_version  S32         0
@@ -114,11 +111,10 @@
 p2DoneImfile METADATA
     exp_id      STR         255     # Key
-    class       STR         255
     class_id    STR         255
+    url         STR         255
+    stats       STR         255
+    recipe      STR         64
     p1_version  S32         0
     p2_version  S32         0
-    recipe      STR         64
-    stats       STR         255
-    url         STR         255
 #    url_src     STR         255  - input image
 #    url_astrom  STR         255  - output astrometry
@@ -127,13 +123,15 @@
 END
 
-# nclass is not here... is it needed?
+# imfiles is not here... is it needed?
 
 p3PendingExp METADATA
     exp_id      STR         255     # Primary Key
     camera      STR         255
-    exp_type     STR         255
+    exp_type    STR         255
+    class       STR         255
+    imfiles     S32         0
     filter      STR         255
-    class       STR         255
-    nclass      S32         0
+    stats       STR         255
+    recipe      STR         64
     p2_version  S32         0
     p3_version  S32         0
@@ -144,7 +142,7 @@
     version     STR         64
     label       STR         255
-    exp_type     STR         255
+    exp_type    STR         255
     class       STR         255
-    nclass      S32         0
+    imfiles     S32         0
     filter      STR         255
     exptime     S32         0
@@ -153,5 +151,4 @@
 masterDetrendImfile METADATA
     det_id      STR         255     # Key
-    class       STR         255
     class_id    STR         255
     url         STR         255