IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 29, 2008, 2:44:04 PM (18 years ago)
Author:
eugene
Message:

merge cvs HEAD into cleanup branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/cleanup/ippTools/src/pxinjectConfig.c

    r16509 r18357  
    6868    // -newImfile
    6969    psMetadata *newImfileArgs = psMetadataAlloc();
    70     psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-exp_id",  0,
    71             "define the exp_id (required)", NULL);
     70    psMetadataAddS64(newImfileArgs, PS_LIST_TAIL, "-exp_id",  0,
     71            "define the exp_id (required)", 0);
    7272    psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-tmp_class_id",  0,
    7373            "define the class ID (required)", NULL);
     
    7777    // -updatenewExp
    7878    psMetadata *updatenewExpArgs = psMetadataAlloc();
    79     psMetadataAddStr(updatenewExpArgs, PS_LIST_TAIL, "-exp_id",  0,
    80             "define the exp_id (required)", NULL);
     79    psMetadataAddS64(updatenewExpArgs, PS_LIST_TAIL, "-exp_id",  0,
     80            "define the exp_id (required)", 0);
    8181    psMetadataAddStr(updatenewExpArgs, PS_LIST_TAIL, "-state", 0,
    8282            "set state (required)", NULL);
     
    192192    // do this last so we don't setup a connection before CLI options are
    193193    // validated
    194     config->dbh = pmConfigDB(config->modules);
     194    config->dbh = psMemIncrRefCounter(pmConfigDB(config->modules));
    195195    if (!config->dbh) {
    196196        psError(PS_ERR_UNKNOWN, false, "Can't configure database");
Note: See TracChangeset for help on using the changeset viewer.