IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Nov 9, 2008, 1:51:39 PM (18 years ago)
Author:
Paul Price
Message:

Change to run a subset of a camera seems to work, based on a simtest and a manual run through with one of two rawImfiles with ignored = 1. Merging pap_branch_20081109; no conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ippTools/src/regtool.c

    r20103 r20608  
    231231    PXOPT_LOOKUP_F32(moon_alt,   config->args, "-moon_alt",   false, false);
    232232    PXOPT_LOOKUP_F32(moon_phase, config->args, "-moon_phase", false, false);
     233    PXOPT_LOOKUP_BOOL(ignored, config->args, "-ignore", false);
    233234    PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
    234235    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     
    290291        user_5,
    291292        object,
    292         sun_angle,
    293         sun_alt,
    294         moon_angle,
    295         moon_alt,
    296         moon_phase,
     293        sun_angle,
     294        sun_alt,
     295        moon_angle,
     296        moon_alt,
     297        moon_phase,
     298        ignored,
    297299        hostname,
    298300        code,
     
    404406    if (!query) {
    405407        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    406         psFree(where);
     408        psFree(where);
    407409        return false;
    408410    }
     
    443445    if (!pxSetFaultCode(config->dbh, "rawImfile", where, code)) {
    444446        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    445         psFree (where);
     447        psFree (where);
    446448        return false;
    447449    }
     
    750752        user_5,
    751753        object,
    752         sun_angle,
    753         sun_alt,
    754         moon_angle,
    755         moon_alt,
    756         moon_phase,
     754        sun_angle,
     755        sun_alt,
     756        moon_angle,
     757        moon_alt,
     758        moon_phase,
    757759        hostname,
    758760        code,
     
    954956    if (!query) {
    955957        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    956         psFree(where);
     958        psFree(where);
    957959        return false;
    958960    }
     
    961963        psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp");
    962964        psStringAppend(&query, " AND %s", whereClause);
    963         psFree(where);
     965        psFree(where);
    964966        psFree(whereClause);
    965967    }
     
    993995    if (!pxSetFaultCode(config->dbh, "rawExp", where, code)) {
    994996        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    995         psFree(where);
     997        psFree(where);
    996998        return false;
    997999    }
Note: See TracChangeset for help on using the changeset viewer.