IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 35896 for trunk/ippTools/src


Ignore:
Timestamp:
Aug 6, 2013, 11:05:55 AM (13 years ago)
Author:
bills
Message:

Add columns ippRelease.dvodb and ippRelease.ubercal_file and relExp.ubercal_dist

Location:
trunk/ippTools/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/releasetool.c

    r35795 r35896  
    180180    PS_ASSERT_PTR_NON_NULL(config, false);
    181181
    182     PXOPT_LOOKUP_S32(surveyID,    config->args, "-set_surveyID", true, false);
    183     PXOPT_LOOKUP_STR(release_name, config->args, "-set_release_name", true, false);
     182    PXOPT_LOOKUP_S32(surveyID,    config->args,   "-set_surveyID", true, false);
     183    PXOPT_LOOKUP_STR(release_name, config->args,  "-set_release_name", true, false);
    184184    PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state",  true, false);
    185     PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false);
    186     PXOPT_LOOKUP_S32(priority,    config->args, "-set_priority", false, false);
     185    PXOPT_LOOKUP_S32(dataRelease, config->args,   "-set_dataRelease", false, false);
     186    PXOPT_LOOKUP_S32(priority,    config->args,   "-set_priority", false, false);
     187    PXOPT_LOOKUP_STR(dvodb, config->args,         "-set_dvodb",  false, false);
     188    PXOPT_LOOKUP_STR(ubercal_file, config->args,  "-set_ubercal_file",  false, false);
    187189
    188190    if (!ippReleaseInsert(config->dbh,
    … …  
    192194        release_state,
    193195        dataRelease,
    194         priority
     196        priority,
     197        dvodb,
     198        ubercal_file
    195199    )) {
    196200        psError(PS_ERR_UNKNOWN, false, "failed to insert ippRelease");
    … …  
    215219    PXOPT_LOOKUP_S32(priority,         config->args, "-set_priority",  false, false);
    216220    PXOPT_LOOKUP_S32(dataRelease,      config->args, "-set_dataRelease",  false, false);
    217     if (!release_state && priority == 0 && dataRelease == -1) {
    218         psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority and -set_dataRelease is required\n");
     221    PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb",  false, false);
     222    PXOPT_LOOKUP_STR(ubercal_file, config->args, "-set_ubercal_file",  false, false);
     223    if (!release_state && priority == 0 && dataRelease == -1 && !dvodb && !ubercal_file) {
     224        psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority -set_dvodb -set_ubercal_file and -set_dataRelease is required\n");
    219225        return false;
    220226    }
    … …  
    366372    PXOPT_LOOKUP_F32(user_zpt_obs, config->args,   "-set_zpt_obs", false, false);
    367373    PXOPT_LOOKUP_F32(user_zpt_stdev, config->args, "-set_zpt_stdev", false, false);
     374    PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
    368375    PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false);
    369376    PXOPT_LOOKUP_S16(fault, config->args,     "-set_fault", false, false);
    … …  
    456463            zpt_obs,
    457464            zpt_stdev,
     465            ubercal_dist,
    458466            path_base,
    459467            fault,
    … …  
    500508    PXOPT_LOOKUP_F32(zpt_stdev,config->args, "-set_zpt_stdev",  false, false);
    501509    PXOPT_LOOKUP_S16(fault,    config->args, "-set_fault",  false, false);
     510    PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
    502511    PXOPT_LOOKUP_BOOL(clearfault, config->args, "-clearfault",  false);
    503     if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault) {
     512    if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault && !ubercal_dist) {
    504513        psError(PXTOOLS_ERR_CONFIG, true, "must set at least one column\n");
    505514        return false;
    … …  
    555564    if (clearfault) {
    556565        psStringAppend(&query, "%s relExp.fault = 0", sep);
     566        sep = comma;
     567    }
     568    if (ubercal_dist) {
     569        psStringAppend(&query, "%s relExp.ubercal_dist = %d", sep, ubercal_dist);
    557570        sep = comma;
    558571    }

  • trunk/ippTools/src/releasetoolConfig.c

    r35795 r35896  
    6464    psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define release state", NULL);
    6565    psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_priority", 0,      "define release priority", 0);
     66    psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_dvodb", 0,         "define dvo db name", NULL);
     67    psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_ubercal_file", 0,  "define ubercal file name", NULL);
    6668
    6769    // -uptdaterelease
    … …  
    7577    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_priority", 0,       "define new release priority", 0);
    7678    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0,    "define data release", -1);
     79    psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_dvodb", 0,         "define new dvo db name", NULL);
     80    psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_ubercal_file", 0,  "define new ubercal file name", NULL);
    7781
    7882
    … …  
    108112    psMetadataAddF32(definerelexpArgs,  PS_LIST_TAIL, "-set_zpt_obs", 0,    "define zero point", NAN);
    109113    psMetadataAddF32(definerelexpArgs,  PS_LIST_TAIL, "-set_zpt_stdev", 0,  "define zero point stdev", NAN);
     114    psMetadataAddS32(definerelexpArgs,  PS_LIST_TAIL, "-set_ubercal_dist", 0,  "define ubercal dist", 0);
    110115    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-set_path_base", 0,  "define state", NULL);
    111116    psMetadataAddS16(definerelexpArgs,  PS_LIST_TAIL, "-set_fault", 0,      "define fault", 0);
    … …  
    126131    psMetadataAddF32(updaterelexpArgs,  PS_LIST_TAIL, "-set_zpt_obs", 0,    "define new zero point", NAN);
    127132    psMetadataAddF32(updaterelexpArgs,  PS_LIST_TAIL, "-set_zpt_stdev", 0,  "define new zero point stdev", NAN);
     133    psMetadataAddS32(updaterelexpArgs,  PS_LIST_TAIL, "-set_ubercal_dist", 0, "define new ubercal dist", 0);
    128134    psMetadataAddStr(updaterelexpArgs,  PS_LIST_TAIL, "-set_path_base", 0,  "define path_base", NULL);
    129135    psMetadataAddS16(updaterelexpArgs,  PS_LIST_TAIL, "-set_fault", 0,      "define new fault", 0);
Note: See TracChangeset for help on using the changeset viewer.