Changeset 25418 for trunk/ippTools

Timestamp:

Sep 16, 2009, 9:44:29 AM (17 years ago)

Author:

bills

Message:

Store the size in bytes and md5sum of the Compressed raw image files
in pzDownloadImfile. Propagate the values to rawImfile so that they are
available for checking.
(summitImfile has the parameters of the files before they are compressed)

Location:

trunk/ippTools

Files:

• share/pxadmin_create_tables.sql (modified) (3 diffs)
• share/regtool_pendingimfile.sql (modified) (1 diff)
• src/pxinject.c (modified) (1 diff)
• src/pxinjectConfig.c (modified) (1 diff)
• src/pztool.c (modified) (3 diffs)
• src/pztoolConfig.c (modified) (1 diff)
• src/regtool.c (modified) (2 diffs)
• src/regtoolConfig.c (modified) (1 diff)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -58 +58 @@
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     hostname VARCHAR(64),
+    bytes INT,
+    md5sum VARCHAR(32),
     PRIMARY KEY(exp_name, camera, telescope, class, class_id),
     KEY(fault),
@@ -94 +96 @@
     uri VARCHAR(255),
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    bytes INT,
+    md5sum VARCHAR(32),
     PRIMARY KEY(exp_id, tmp_class_id),
     FOREIGN KEY(exp_id) REFERENCES newExp(exp_id)
@@ -237 +241 @@
     raw_image_id BIGINT AUTO_INCREMENT,
     magicked BIGINT,
+    bytes INT,
+    md5sum VARCHAR(32),
     PRIMARY KEY(exp_id, class_id),
     KEY(tmp_class_id),

trunk/ippTools/share/regtool_pendingimfile.sql

@@ -6 +6 @@
     newExp.workdir,
     newImfile.tmp_class_id,
-    newImfile.uri
+    newImfile.uri,
+    newImfile.bytes,
+    newImfile.md5sum
 FROM newImfile
 JOIN newExp

trunk/ippTools/src/pxinject.c

@@ -137 +137 @@
     PXOPT_LOOKUP_STR(tmp_class_id, config->args, "-tmp_class_id", true, false);
     PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
+    PXOPT_LOOKUP_S32(bytes, config->args, "-bytes", false, false);
+    PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false);
 
     // insert with error flag state set to 0 (no errors)
-    if (!newImfileInsert(config->dbh, exp_id, tmp_class_id, uri, NULL)) {
+    if (!newImfileInsert(config->dbh, exp_id, tmp_class_id, uri, NULL, bytes, md5sum)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;

trunk/ippTools/src/pxinjectConfig.c

@@ -61 +61 @@
     psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-tmp_class_id",  0,            "define the class ID (required)", NULL);
     psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-uri",  0,            "define the URI (required)", NULL);
+    psMetadataAddS32(newImfileArgs, PS_LIST_TAIL, "-bytes",  0,            "define the size of the file", 0);
+    psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-md5sum",  0,            "define the size of the file", NULL);
 
     // -updatenewExp

trunk/ippTools/src/pztool.c

@@ -401 +401 @@
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_BOOL(row_lock, config->args, "-row_lock", false);
+    PXOPT_LOOKUP_S32(bytes, config->args, "-bytes", false, false);
+    PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false);
 
     // default values
@@ -457 +459 @@
             fault,
             NULL,    // epoch
-            hostname
+            hostname,
+            bytes,
+            md5sum
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -595 +599 @@
                 "       pzDownloadImfile.class_id," // tmp_class_id
                 "       pzDownloadImfile.uri,"      // uri
-                "       NULL"                       // epoch
+                "       NULL,"                       // epoch
+                "       pzDownloadImfile.bytes,"    // bytes
+                "       pzDownloadImfile.md5sum"    // md5sum
                 "   FROM pzDownloadImfile"
                 "   WHERE"

trunk/ippTools/src/pztoolConfig.c

@@ -95 +95 @@
     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-label",  0,        "define the label for the chip stage", NULL);
     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-hostname",  0,     "define the host that copied the image", NULL);
+    psMetadataAddS32(copydoneArgs, PS_LIST_TAIL, "-bytes",  0,     "define the size in bytes for the copied image", 0);
+    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-md5sum",  0,     "define the md5 sum for the copied image", NULL);
     psMetadataAddS16(copydoneArgs, PS_LIST_TAIL, "-fault",  0,            "set fault code", 0);
     psMetadataAddBool(copydoneArgs, PS_LIST_TAIL, "-row_lock", 0,     "lock pzDownImfile rows while advancing an exposure", false);

trunk/ippTools/src/regtool.c

@@ -238 +238 @@
     PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
+    PXOPT_LOOKUP_S32(bytes, config->args,  "-bytes", false, false);
+    PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false);
 
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
@@ -307 +309 @@
         quality,
         NULL,
-        0
+        0,
+        bytes,
+        md5sum
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");

trunk/ippTools/src/regtoolConfig.c

@@ -125 +125 @@
     ADD_OPT(Time, addprocessedimfileArgs, "-dateobs",        "define observation time",         NULL);
     ADD_OPT(Str,  addprocessedimfileArgs, "-hostname",       "define host name",                NULL);
+    ADD_OPT(Str,  addprocessedimfileArgs, "-md5sum",         "define md5sum",                NULL);
+    ADD_OPT(S32,  addprocessedimfileArgs, "-bytes",          "define bytes",                0);
     ADD_OPT(S16,  addprocessedimfileArgs, "-fault",           "set fault code",                  0);
     ADD_OPT(S16,  addprocessedimfileArgs, "-quality",        "set quality flag", 0);