Index: /trunk/dbconfig/p4.md
===================================================================
--- /trunk/dbconfig/p4.md	(revision 11817)
+++ /trunk/dbconfig/p4.md	(revision 11818)
@@ -1,3 +1,3 @@
-# $Id: p4.md,v 1.11 2007-02-13 22:33:30 jhoblitt Exp $
+# $Id: p4.md,v 1.12 2007-02-15 03:53:24 jhoblitt Exp $
 
 #
@@ -22,10 +22,11 @@
 
 # the list of imfiles in our skycell keyed against phase 3
+# only allow one p3_version of an exp_tag per p4Run
 p4InputExp METADATA
     p4_id       S32         0       # Primary Key
     exp_tag     STR         64      # Primary Key
-    p3_version  S32         0       # Primary Key
+    p3_version  S32         0       # Key
 # if magic is T then look for the exp_tag in the magic output tables
-    magiced     BOOL        f       # Primary Key
+    magiced     BOOL        f       # Key
 END
 
@@ -45,6 +46,6 @@
     skycell_id  STR         64      # Primary Key
     tess_id     STR         64      # Primary Key
-    exp_tag     STR         64      # Primary Key
-    p3_version  S32         0       # Primary Key
+    exp_tag     STR         64      # Key
+    p3_version  S32         0       # Key
     uri         STR         255
     bg          F64         0.0
Index: /trunk/dbconfig/p5.md
===================================================================
--- /trunk/dbconfig/p5.md	(revision 11817)
+++ /trunk/dbconfig/p5.md	(revision 11818)
@@ -1,3 +1,3 @@
-# $Id: p5.md,v 1.2 2007-02-15 02:01:30 jhoblitt Exp $
+# $Id: p5.md,v 1.3 2007-02-15 03:53:24 jhoblitt Exp $
 
 p5Run METADATA
@@ -18,6 +18,4 @@
     skycell_id  STR         64      # Primary Key
     tess_id     STR         64      # Primary Key
-    exp_tag     STR         64      # Primary Key
-    p3_version  S32         0       # Primary Key
 # either a input or a template
     kind        STR         64      # Key 
Index: /trunk/ippTools/src/difftool.c
===================================================================
--- /trunk/ippTools/src/difftool.c	(revision 11817)
+++ /trunk/ippTools/src/difftool.c	(revision 11818)
@@ -235,20 +235,4 @@
         return false;
     }
-    psString exp_tag = psMetadataLookupStr(&status, config->args, "-exp_tag");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_tag");
-        return false;
-    }
-    if (!exp_tag) {
-        psError(PS_ERR_UNKNOWN, true, "-exp_tag is required");
-        return false;
-    }
-
-    // defaults to 0
-    psS32 p3_version = psMetadataLookupS32(&status, config->args, "-p3_version");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -p3_version");
-        return false;
-    }
 
     psString kind = psMetadataLookupStr(&status, config->args, "-kind");
@@ -273,6 +257,4 @@
             skycell_id,
             tess_id,
-            exp_tag,
-            p3_version,
             kind,
             template
@@ -402,6 +384,4 @@
         "  AND p5InputScfile.skycell_id = p4Scfile.skycell_id\n"
         "  AND p5InputScfile.tess_id    = p4Scfile.tess_id\n"
-        "  AND p5InputScfile.exp_tag    = p4Scfile.exp_tag\n"
-        "  AND p5InputScfile.p3_version = p4Scfile.p3_version\n"
         " LEFT JOIN p5DiffScfile\n"
         "   ON p5InputScfile.p5_id      = p5DiffScfile.p5_id\n"
Index: /trunk/ippTools/src/difftoolConfig.c
===================================================================
--- /trunk/ippTools/src/difftoolConfig.c	(revision 11817)
+++ /trunk/ippTools/src/difftoolConfig.c	(revision 11818)
@@ -78,8 +78,4 @@
     psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-tess_id", 0,
             "dfine tess ID", NULL);
-    psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
-            "define exposure tag (required)", NULL);
-    psMetadataAddS32(addinputscfileArgs, PS_LIST_TAIL, "-p3_version", 0,
-            "define phase 3 version of exposure tag (required)", 0);
     psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-kind", 0,
             "define kind", NULL);
@@ -97,8 +93,4 @@
     psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-tess_id", 0,
             "search by tess ID", NULL);
-    psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
-            "search by exposure tag (required)", NULL);
-    psMetadataAddS32(inputscfileArgs, PS_LIST_TAIL, "-p3_version", 0,
-            "search by phase 3 version of exposure tag (required)", 0);
     psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-kind", 0,
             "search by kind", NULL);
@@ -260,5 +252,4 @@
     addWhereStr(skycell_id);
     addWhereStr(tess_id);
-    addWhereStr(exp_tag);
 
     if (config->where->list->n < 1) {