Changeset 11979

Timestamp:

Feb 21, 2007, 11:52:12 AM (19 years ago)

Author:

jhoblitt

Message:

add skycell_id & tess_id to p5Run and remove them from p5DiffScfile

Location:

trunk

Files:

• dbconfig/config.md (modified) (1 diff)
• dbconfig/p5.md (modified) (3 diffs)
• ippTools/src/difftool.c (modified) (6 diffs)
• ippTools/src/difftoolConfig.c (modified) (2 diffs)

trunk/dbconfig/config.md

@@ -2 +2 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.9
+    pkg_version     STR     1.1.10
 END

trunk/dbconfig/p5.md

@@ -1 @@
-# $Id: p5.md,v 1.4 2007-02-17 04:14:23 jhoblitt Exp $
+# $Id: p5.md,v 1.5 2007-02-21 21:52:12 jhoblitt Exp $
 
 p5Run METADATA
@@ -7 +7 @@
     dvodb       STR         255
     registered  TAI         NULL
+    skycell_id  STR         64      # Key
+    tess_id     STR         64      # Key
 END
 
@@ -26 +28 @@
 p5DiffScfile METADATA
     p5_id       S32         0       # Primary Key
-    skycell_id  STR         64      # Primary Key
-    tess_id     STR         64      # Primary Key
     uri         STR         255
     bg          F64         0.0

trunk/ippTools/src/difftool.c

@@ -104 +104 @@
     }
 
+    psString skycell_id = psMetadataLookupStr(&status, config->args, "-skycell_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -skycell_id");
+        return false;
+    }
+    if (!skycell_id) {
+        psError(PS_ERR_UNKNOWN, true, "-skycell_id is required");
+        return false;
+    }
+
+    psString tess_id = psMetadataLookupStr(&status, config->args, "-tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tess_id");
+        return false;
+    }
+    if (!tess_id) {
+        psError(PS_ERR_UNKNOWN, true, "-tess_id is required");
+        return false;
+    }
+
     psTime *registered = NULL;
     {
@@ -124 +144 @@
             workdir,
             NULL,       // dvodb
-            registered
+            registered,
+            skycell_id,
+            tess_id
     );
     psFree(registered);
@@ -390 +412 @@
         " LEFT JOIN p5DiffScfile\n"
         "   ON p5InputScfile.p5_id      = p5DiffScfile.p5_id\n"
-        "  AND p5InputScfile.skycell_id = p5DiffScfile.skycell_id\n"
-        "  AND p5InputScfile.tess_id    = p5DiffScfile.tess_id\n"
         " WHERE\n"
         "   p5Run.state = 'run'\n" 
         "   AND p5DiffScfile.p5_id IS NULL\n"
-        "   AND p5DiffScfile.skycell_id IS NULL\n"
-        "   AND p5DiffScfile.tess_id IS NULL\n"
     );
 
@@ -479 +497 @@
     }
 
-    psString skycell_id = psMetadataLookupStr(&status, config->args, "-skycell_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -skycell_id");
-        return false;
-    }
-    if (!skycell_id) {
-        psError(PS_ERR_UNKNOWN, true, "-skycell_id is required");
-        return false;
-    }
-
-    psString tess_id = psMetadataLookupStr(&status, config->args, "-tess_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tess_id");
-        return false;
-    }
-    if (!tess_id) {
-        psError(PS_ERR_UNKNOWN, true, "-tess_id is required");
-        return false;
-    }
-
     psString uri = psMetadataLookupStr(&status, config->args, "-uri");
     if (!status) {
@@ -525 +523 @@
     if (!p5DiffScfileInsert(config->dbh, 
             (psS32)atoi(p5_id),
-            skycell_id,
-            tess_id,
             uri,
             bg,
@@ -553 +549 @@
     psString query = psStringCopy( 
         "SELECT\n"
+        "   p5Run.skycell_id,\n"
+        "   p5Run.tess_id,\n"
         "   p5DiffScfile.*\n"
         " FROM p5Run\n"

trunk/ippTools/src/difftoolConfig.c

@@ -53 +53 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-registered",  0,
             "time detrend run was registered", now);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-skycell_id",  0,
+            "define skycell ID (required)", NULL);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id",  0,
+            "define tessellation ID (required)", NULL);
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
@@ -116 +120 @@
     psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-p5_id", 0,
             "define p4 ID (required)", NULL);
-    psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-skycell_id",  0,
-            "define skycell ID (required)", NULL);
-    psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-tess_id",  0,
-            "define tessellation ID (required)", NULL);
     psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI of file (required)", 0);