IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 19003


Ignore:
Timestamp:
Aug 10, 2008, 10:32:59 AM (18 years ago)
Author:
eugene
Message:

updates from current HEAD

Location:
branches/eam_branch_20080719/ippTools
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20080719/ippTools/share/chiptool_processedimfile.sql

    r18923 r19003  
    66    chipProcessedImfile.bg_mean_stdev,
    77    chipProcessedImfile.path_base,
     8    chipRun.state,
    89    rawExp.exp_id,
    910    rawExp.exp_tag,

  • branches/eam_branch_20080719/ippTools/share/difftool_skyfile.sql

    r18644 r19003  
    22    diffRun.skycell_id,
    33    diffRun.tess_id,
    4     diffSkyfile.*
     4    diffRun.state,
     5    diffSkyfile.*,
     6    rawExp.exp_id,
     7    rawExp.camera
    58FROM diffRun
    69JOIN diffSkyfile
    710    USING(diff_id)
    8 WHERE
    9     diffRun.state = 'new'
    10 
     11-- WS: my new stuff begins here
     12JOIN diffInputSkyfile
     13    ON diffInputSkyfile.diff_id = diffRun.diff_id
     14    AND diffInputSkyfile.template = 0
     15JOIN warpRun
     16    ON diffInputSkyfile.warp_id = warpRun.warp_id
     17JOIN fakeRun
     18    ON warpRun.fake_id = fakeRun.fake_id
     19JOIN camRun
     20    ON camRun.cam_id = fakeRun.cam_id
     21JOIN chipRun
     22    ON camRun.chip_id = chipRun.chip_id
     23JOIN rawExp
     24    ON chipRun.exp_id = rawExp.exp_id
     25-- WS: my new stuff ends here
     26    WHERE
     27    -- bogus test to allow appending conditionals
     28    -- XXX EAM : this is not needed if we modify the difftool.c code : fix
     29    diffRun.diff_id IS NOT NULL

  • branches/eam_branch_20080719/ippTools/share/stacktool_sumskyfile.sql

    r18644 r19003  
    11SELECT
    2     stackSumSkyfile.*
     2    stackSumSkyfile.*,
     3    stackRun.state,
     4    rawExp.camera
    35FROM stackRun
    46JOIN stackSumSkyfile
    57    USING(stack_id)
     8JOIN warpRun
     9    -- just need 1 warp to find the camera
     10    ON warpRun.warp_id = (SELECT warp_id FROM stackInputSkyfile
     11                            WHERE stackInputSkyfile.stack_id = stackRun.stack_id limit 1)
     12JOIN fakeRun
     13    ON warpRun.fake_id = fakeRun.fake_id
     14JOIN camRun
     15    ON camRun.cam_id   = fakeRun.cam_id
     16JOIN chipRun
     17    ON camRun.chip_id  = chipRun.chip_id
     18JOIN rawExp
     19    ON chipRun.exp_id  = rawExp.exp_id
    620WHERE
    7     stackRun.state = 'new'
     21-- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too
     22-- XXX EAM : this is not needed : fix the stacktool code.
     23    stackRun.stack_id is NOT NULL

  • branches/eam_branch_20080719/ippTools/share/warptool_warped.sql

    r18644 r19003  
    11SELECT
    2     warpSkyfile.*
     2    warpSkyfile.*,
     3    warpRun.state,
     4    rawExp.exp_id,
     5    rawExp.camera
    36FROM warpRun
    47JOIN warpSkyfile
    58    USING(warp_id)
     9JOIN fakeRun
     10    ON warpRun.fake_id = fakeRun.fake_id
     11JOIN camRun
     12    ON camRun.cam_id   = fakeRun.cam_id
     13JOIN chipRun
     14    ON camRun.chip_id  = chipRun.chip_id
     15JOIN rawExp
     16    ON chipRun.exp_id  = rawExp.exp_id
    617WHERE
    7     warpRun.state = 'new'
     18-- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too
     19-- XXX EAM : not needed: fix warptool.c
     20    warpRun.warp_id is NOT NULL

  • branches/eam_branch_20080719/ippTools/src/chiptool.c

    r18923 r19003  
    523523    PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "==");
    524524    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
     525    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
    525526    PXOPT_COPY_STR(config->args, where, "-class_id", "chipProcessedImfile.class_id", "==");
    526527    PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "==");

  • branches/eam_branch_20080719/ippTools/src/chiptoolConfig.c

    r18942 r19003  
    192192    // -processedimfile
    193193    psMetadata *processedimfileArgs = psMetadataAlloc();
    194     psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-chip_id",  0,            "define chip ID", 0);
    195     psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "define exposure ID", 0);
    196     psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "define class ID", NULL);
     194    psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-chip_id",  0,         "define chip ID", 0);
     195    psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,          "define exposure ID", 0);
     196    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_name",  0,        "define exposure name", NULL);
     197    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,        "define class ID", NULL);
    197198    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-inst",  0,            "define camera of interest", NULL);
    198     psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter",  0,            "define filter of interest", NULL);
    199     psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    200     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted",  0,            "only return imfiles with a fault status set", false);
    201     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     199    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter",  0,          "define filter of interest", NULL);
     200    psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit",  0,           "limit result set to N items", 0);
     201    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted",  0,        "only return imfiles with a fault status set", false);
     202    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,         "use the simple output format", false);
    202203
    203204    // -updateprocessedimfile

  • branches/eam_branch_20080719/ippTools/src/difftool.c

    r18923 r19003  
    525525
    526526    psMetadata *where = psMetadataAlloc();
    527     PXOPT_COPY_S64(config->args, where,  "-diff_id", "diff_id", "==");
    528     PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
    529     PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "==");
     527    PXOPT_COPY_S64(config->args, where,  "-diff_id", "diffSkyfile.diff_id", "==");
     528    PXOPT_COPY_STR(config->args, where, "-skycell_id", "diffSkyfile.skycell_id", "==");
     529    PXOPT_COPY_STR(config->args, where, "-tess_id", "diffSkyfile.tess_id", "==");
     530    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
     531    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
    530532
    531533    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    539541
    540542    if (psListLength(where->list)) {
    541         psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile");
     543        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    542544        psStringAppend(&query, " AND %s", whereClause);
    543545        psFree(whereClause);
    … …  
    11251127
    11261128    psFree(output);
    1127 
    1128     return true;
    1129 }
     1129    return true;
     1130}

  • branches/eam_branch_20080719/ippTools/src/difftoolConfig.c

    r18942 r19003  
    104104    psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id",  0,            "define skycell ID", NULL);
    105105    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-tess_id",  0,            "define tessellation ID", NULL);
     106    psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "define exposure ID", 0);
     107    psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-exp_name",  0,         "define exposure name", NULL);
    106108    psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    107109    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);

  • branches/eam_branch_20080719/ippTools/src/pstamptool.c

    r18923 r19003  
    220220    PXOPT_LOOKUP_STR(uri,         config->args, "-uri",           true, false);
    221221    // PXOPT_LOOKUP_STR(outFileset,  config->args, "-out_fileset",   true, false);
    222     PXOPT_LOOKUP_STR(ds_id,       config->args, "-ds_id",         false, false);
     222    PXOPT_LOOKUP_S32(ds_id,       config->args, "-ds_id",         false, false);
    223223
    224224    char *query ="INSERT INTO pstampRequest"
    225225                     " (state, uri, ds_id, fault)"
    226                      " VALUES( 'new', '%s', %s, 0 )";
     226                     " VALUES( 'new', '%s', %" PRId64 ", 0 )";
    227227    if (!p_psDBRunQuery(config->dbh, query, uri, ds_id)) {
    228228        psError(PS_ERR_UNKNOWN, false, "database error");

  • branches/eam_branch_20080719/ippTools/src/pstamptoolConfig.c

    r18923 r19003  
    6464    psMetadata *addreqArgs = psMetadataAlloc();
    6565    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-uri", 0,            "define request file uri", NULL);
    66     psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-ds_id", 0,            "define request ds_id", NULL);
     66    psMetadataAddS32(addreqArgs, PS_LIST_TAIL, "-ds_id", 0,            "define request ds_id", 0);
    6767    // psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-out_fileset", 0,            "define request output_fileset", NULL);
    6868

  • branches/eam_branch_20080719/ippTools/src/pxadmin.c

    r18923 r19003  
    122122
    123123    {
    124         bool status;
    125124        char line[128], answer[128];
    126125
    127         // XXX use the values defined in config->dbh?
    128         psString dbName = psMetadataLookupStr(&status, config->modules->complete, "DBNAME");
     126        psMetadataItem *name = pmConfigUserSite(config->modules, "DBNAME", PS_DATA_STRING);
     127        if (!name) {
     128            psError(PS_ERR_UNKNOWN, false, "Unable to determine database name.");
     129            return false;
     130        }
     131        psString dbName = name->data.str;
    129132
    130133        fprintf(stdout, "*** delete the tables from database %s? ***\n", dbName);
    … …  
    150153        sscanf(line, "%s", answer);
    151154
    152         psString dbPassword = psMetadataLookupStr(&status, config->modules->complete, "DBPASSWORD");
     155        psMetadataItem *pass = pmConfigUserSite(config->modules, "DBPASSWORD", PS_DATA_STRING);
     156        if (!pass) {
     157            psError(PS_ERR_UNKNOWN, false, "Unable to determine database password.");
     158            return false;
     159        }
     160        psString dbPassword = pass->data.str;
    153161        if (strcmp (answer, dbPassword)) {
    154162            psError(PS_ERR_UNKNOWN, true, "invalid passwd - tables NOT deleleted");

  • branches/eam_branch_20080719/ippTools/src/pxadminConfig.c

    r18622 r19003  
    2727#include "pxadmin.h"
    2828
    29 static void pxAdminShowDB (pxConfig *config, const char *program) {
    30 
    31     bool status;
    32 
     29static void pxAdminShowDB (const pxConfig *config, const char *program)
     30{
    3331    fprintf (stderr, "\nPan-STARRS DataBase Admin Tool\n\n");
    3432    fprintf (stderr, "Usage: %s [mode]\n", program);
    3533    fprintf (stderr, " [mode] : -create | -delete\n\n");
    3634
    37     // XXX EAM : this should be done with psDB function calls
    38     psString dbServer = psMetadataLookupStr(&status, config->modules->complete, "DBSERVER");
    39     psString dbUsername = psMetadataLookupStr(&status, config->modules->complete, "DBUSER");
    40     psString dbName = psMetadataLookupStr(&status, config->modules->complete, "DBNAME");
    41     psS32 dbPort = psMetadataLookupS32(&status, config->modules->complete, "DBPORT");
     35    psMetadataItem *server = pmConfigUserSite(config->modules, "DBSERVER",   PS_DATA_STRING);
     36    psMetadataItem *user   = pmConfigUserSite(config->modules, "DBUSER",     PS_DATA_STRING);
     37    psMetadataItem *name   = pmConfigUserSite(config->modules, "DBNAME",     PS_DATA_STRING);
     38    psMetadataItem *port   = pmConfigUserSite(config->modules, "DBPORT",     PS_TYPE_S32);
    4239
    43     fprintf (stderr, "connecting to %s as %s (port %d)\n", dbServer, dbUsername, dbPort);
    44     fprintf (stderr, "using database %s\n\n", dbName);
     40    if (!server || !user || !name) {
     41        psErrorClear();
     42        psWarning("Unable to determine database connection details.");
     43        return;
     44    }
     45    if (!port) {
     46        psErrorClear();
     47    }
     48
     49    fprintf (stderr, "connecting to %s as %s (port %d)\n", server->data.str, user->data.str,
     50             port ? port->data.S32 : 0);
     51    fprintf (stderr, "using database %s\n\n", name->data.str);
    4552
    4653    return;

  • branches/eam_branch_20080719/ippTools/src/pzgetexp.c

    r18923 r19003  
    149149    if (!psDBTransaction(config->dbh)) {
    150150        psError(PS_ERR_UNKNOWN, false, "database error");
     151        psFree(newSummitExps);
    151152        return false;
     153    }
     154
     155    // increase memory table size limits; deafult is 16MB
     156    {
     157        // 512MB
     158        char *query = "SET max_heap_table_size = 1024*1024*512";
     159        if (!p_psDBRunQuery(config->dbh, query)) {
     160            // rollback
     161            if (!psDBRollback(config->dbh)) {
     162                psError(PS_ERR_UNKNOWN, false, "database error");
     163            }
     164            psError(PS_ERR_UNKNOWN, false, "database error");
     165            psFree(newSummitExps);
     166            return false;
     167        }
    152168    }
    153169

  • branches/eam_branch_20080719/ippTools/src/stacktool.c

    r18923 r19003  
    358358    if (!stackRunPrintObjects(stdout, list, !simple)) {
    359359        psError(PS_ERR_UNKNOWN, false, "failed to print object");
    360         return false;
    361     }
    362 
     360        psFree(list);
     361        return false;
     362    }
    363363    psFree(list);
    364 
    365364    return true;
    366365}
    … …  
    714713
    715714    psMetadata *where = psMetadataAlloc();
    716     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
    717     PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
     715    PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "==");
     716    PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "==");
     717    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
     718    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
    718719
    719720    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    727728
    728729    if (psListLength(where->list)) {
    729         psString whereClause = psDBGenerateWhereConditionSQL(where, "stackSumSkyfile");
     730        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    730731        psStringAppend(&query, " AND %s", whereClause);
    731732        psFree(whereClause);

  • branches/eam_branch_20080719/ippTools/src/stacktoolConfig.c

    r18942 r19003  
    126126    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,            "search by stack ID", 0);
    127127    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
     128    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-exp_id", 0,            "search by exposure ID", 0);
     129    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-exp_name", 0,          "search by exposure name", NULL);
    128130    psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    129131    psMetadataAddBool(sumskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    … …  
    165167    PXOPT_ADD_MODE("-tosum",           "", STACKTOOL_MODE_TOSUM,          tosumArgs);
    166168    PXOPT_ADD_MODE("-addsumskyfile",   "", STACKTOOL_MODE_ADDSUMSKYFILE,   addsumskyfileArgs);
    167     PXOPT_ADD_MODE("-sumskyfile",      "", STACKTOOL_MODE_SUMSKYFILE,      sumskyfileArgs);
     169    PXOPT_ADD_MODE("-sumskyfile",      "list results of stackRun", STACKTOOL_MODE_SUMSKYFILE,      sumskyfileArgs);
    168170    PXOPT_ADD_MODE("-revertsumskyfile","", STACKTOOL_MODE_REVERTSUMSKYFILE,      revertsumskyfileArgs);
    169171    PXOPT_ADD_MODE("-pendingcleanuprun",     "show runs that need to be cleaned up", STACKTOOL_MODE_PENDINGCLEANUPRUN,    pendingcleanuprunArgs);

  • branches/eam_branch_20080719/ippTools/src/warptool.c

    r18942 r19003  
    916916
    917917    psMetadata *where = psMetadataAlloc();
    918     PXOPT_COPY_S64(config->args, where, "-warp_id",    "warp_id", "==");
    919     PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
    920     PXOPT_COPY_STR(config->args, where, "-tess_id",    "tess_id", "==");
    921     PXOPT_COPY_S64(config->args, where, "-exp_id",     "exp_id", "==");
    922     PXOPT_COPY_S64(config->args, where, "-fake_id",    "fake_id", "==");
     918    PXOPT_COPY_S64(config->args, where, "-warp_id",    "warpSkyfile.warp_id", "==");
     919    PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpSkyfile.skycell_id", "==");
     920    PXOPT_COPY_STR(config->args, where, "-tess_id",    "warpSkyfile.tess_id", "==");
     921    PXOPT_COPY_S64(config->args, where, "-exp_id",     "rawExp.exp_id", "==");
     922    PXOPT_COPY_STR(config->args, where, "-exp_name",   "rawExp.exp_name", "==");
     923    PXOPT_COPY_S64(config->args, where, "-fake_id",    "fakeRun.fake_id", "==");
    923924
    924925    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    933934
    934935    if (psListLength(where->list)) {
    935         psString whereClause = psDBGenerateWhereConditionSQL(where, "warpSkyfile");
     936        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    936937        psStringAppend(&query, " AND %s", whereClause);
    937938        psFree(whereClause);

  • branches/eam_branch_20080719/ippTools/src/warptoolConfig.c

    r18942 r19003  
    182182    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id",  0,            "define tessellation ID", NULL);
    183183    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0,            "define exposure tag", 0);
     184    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_name", 0,          "define exposure tag", 0);
    184185    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0,            "define phase 3 version of exposure tag", 0);
    185186    psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
Note: See TracChangeset for help on using the changeset viewer.