Changeset 7378

Timestamp:

Jun 6, 2006, 4:48:56 PM (20 years ago)

Author:

jhoblitt

Message:

initial implementation of -addmaster & -master

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (2 diffs)
• dettoolConfig.c (modified) (5 diffs)

trunk/ippTools/src/dettool.c

@@ -1625 +1625 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // det_id & iteration are required
+    bool status = false;
+    psString det_id = psMetadataLookupStr(&status, config->args, "-det_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -det_id");
+        return false;
+    }
+    if (!det_id) {
+        psError(PS_ERR_UNKNOWN, true, "-det_id is required");
+        return false;
+    }
+    psString iteration = psMetadataLookupStr(&status, config->args, "-iteration");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -iteration");
+        return false;
+    }
+    if (!iteration) {
+        psError(PS_ERR_UNKNOWN, true, "-iteration is required");
+        return false;
+    }
+    // comment is optional
+    psString comment = psMetadataLookupStr(&status, config->args, "-comment");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -comment");
+        return false;
+    }
+
+    // create a new detMasterFrame row and insert it
+    detMasterFrameRow *masterFrame = detMasterFrameRowAlloc(
+                (psS32)atol(det_id),
+                (psS32)atol(iteration),
+                comment // may be NULL
+            );
+
+    if (!detMasterFrameInsertObject(config->dbh, masterFrame)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(masterFrame);
+        return false;
+    }
+
+    psFree(masterFrame);
+
     return true;
 }
@@ -1632 +1674 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // no options are required... use the default where statement
+    psArray *masterFrames= detMasterFrameSelectRowObjects(config->dbh,
+            config->where, 0);
+    if (!masterFrames) {
+        psError(PS_ERR_UNKNOWN, false, "no detMasterFrame rows found");
+        return false;
+    }
+
+    if (psArrayLength(masterFrames)) {
+        // print imfile list
+        psMetadata *output = psMetadataAlloc();
+        for (long i = 0; i < psArrayLength(masterFrames); i++) {
+            psMetadata *md = detMasterFrameMetadataFromObject(
+                    masterFrames->data[i]);
+            psMetadataAddMetadata(
+                output, PS_LIST_TAIL, "detMasterFrame",
+                PS_META_DUPLICATE_OK, NULL, md
+            );
+        }
+
+        psString str = psMetadataConfigFormat(output); 
+        psFree(output);
+        fprintf(stdout, "%s\n", str);
+        psFree(str);
+    }
+
+    psFree(masterFrames);
+
     return true;
 }

trunk/ippTools/src/dettoolConfig.c

@@ -231 +231 @@
     psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-det_id",  0,
         "define detrend ID (required)", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-iter",  0,
-        "define iteration number", NULL);
+    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-iteration",  0,
+        "define iteration number", NULL);
+    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-comment",  0,
+        "define master frame comment", NULL);
  
     // -master
@@ -275 +277 @@
     PXTOOL_MODE("-addresidexp",     DETTOOL_MODE_ADDRESIDEXP,  addresidexpArgs);
     PXTOOL_MODE("-residexp",        DETTOOL_MODE_RESIDEXP,     residexpArgs);
+    PXTOOL_MODE("-addmaster",       DETTOOL_MODE_ADDMASTER,    addmasterArgs);
     PXTOOL_MODE("-master",          DETTOOL_MODE_MASTER,       masterArgs);
 
@@ -289 +292 @@
         printf("\nPan-STARRS Detrend Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> : [-define|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresid|-resid|-addresidexp|-residexp|-master]\n\n");
+        printf(" <mode> : [-define|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresid|-resid|-addresidexp|-residexp|-addmaster|-master]\n\n");
         fprintf (stdout, "-define ");
         psArgumentHelp(defineArgs);
@@ -338 +341 @@
         psArgumentHelp(residexpArgs);
         psFree(residexpArgs);
+        fprintf (stdout, "-addmaster ");
+        psArgumentHelp(addmasterArgs);
+        psFree(addmasterArgs);
         fprintf (stdout, "-master ");
         psArgumentHelp(masterArgs);
@@ -359 +365 @@
     psFree(addresidexpArgs);
     psFree(residexpArgs);
+    psFree(addmasterArgs);
     psFree(masterArgs);