Changeset 11818 for trunk/ippTools/src

Timestamp:

Feb 14, 2007, 5:55:48 PM (19 years ago)

Author:

jhoblitt

Message:

remove exp_tag & p3_version from p4Scfile's primary key

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (3 diffs)
• difftoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/difftool.c

@@ -235 +235 @@
         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 +257 @@
             skycell_id,
             tess_id,
-            exp_tag,
-            p3_version,
             kind,
             template
@@ -402 +384 @@
         "  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"

trunk/ippTools/src/difftoolConfig.c

@@ -78 +78 @@
     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 +93 @@
     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 +252 @@
     addWhereStr(skycell_id);
     addWhereStr(tess_id);
-    addWhereStr(exp_tag);
 
     if (config->where->list->n < 1) {