IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28037


Ignore:
Timestamp:
May 19, 2010, 3:07:38 PM (16 years ago)
Author:
heather
Message:

adding and fixing

Location:
branches/haf_branches/ipp.20100512/ippTools
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/haf_branches/ipp.20100512/ippTools/share/addtool_find_minidvodbrun.sql

    r27936 r28037  
    11SELECT
    2     minidvodbRun.*,
    3     addRun.minidvodb_group
     2    minidvodbRun.*
    43FROM minidvodbRun
    5 LEFT JOIN addRun
    6     USING(minidvodb_name)
    74
     5

  • branches/haf_branches/ipp.20100512/ippTools/src/addtool.c

    r27956 r28037  
    417417        return false;
    418418    }
     419    //psError(PS_ERR_UNKNOWN, false, "database error %s", query);
    419420    psFree(query);
    420421
    … …  
    444445        dvodb_path,
    445446        fault
    446         );
     447        );
    447448
    448449    if (!addProcessedExpInsertObject(config->dbh, row)) {
    … …  
    762763
    763764  PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", true, false);
     765  PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", true, false);
    764766  PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", true, false);
    765767  PXOPT_LOOKUP_STR(mergedvodb_path, config->args, "-set_mergedvodb_path", true, false);
     768  PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
    766769  psMetadata *where = psMetadataAlloc();
    767770
    … …  
    785788    psStringAppend(&query, "INSERT INTO minidvodbRun SET minidvodb_name = '%s' ,",minidvodb_name);
    786789    psStringAppend(&query, "minidvodb_path = '%s' ,",minidvodb_path);
    787     psStringAppend(&query, "mergedvodb_path = '%s' , state = 'new';",mergedvodb_path);
     790    psStringAppend(&query, "mergedvodb_path = '%s',",mergedvodb_path);
     791    psStringAppend(&query, "minidvodb_group = '%s'",minidvodb_group);
     792    if (state) {
     793      psStringAppend(&query, ",state = '%s';", state);
     794    } else {
     795      psStringAppend(&query, ",state = 'new';");
     796    }
    788797   
    789798   
    … …  
    824833    psMetadata *where = psMetadataAlloc();
    825834   
    826     PXOPT_COPY_STR(config->args, where, "-minidvodb_name",     "minidvodb_name", "==");
     835    PXOPT_COPY_STR(config->args, where, "-minidvodb_name",     "minidvodb_name", "LIKE");
    827836    PXOPT_COPY_STR(config->args, where, "-state",     "state", "==");
    828837    PXOPT_COPY_STR(config->args, where, "-minidvodb_path", "minidvodb_path", "==");
    829838    PXOPT_COPY_STR(config->args, where, "-mergedvodb_path", "mergedvodb_path", "==");
     839    PXOPT_COPY_STR(config->args, where, "-minidvodb_group",     "minidvodb_group", "group");
    830840    PXOPT_LOOKUP_STR(minidvodb_name,  config->args, "-set_minidvodb_name", false, false);
    831841    PXOPT_LOOKUP_STR(minidvodb_path,  config->args, "-set_minidvodb_path", false, false);
    832842    PXOPT_LOOKUP_STR(state,  config->args, "-set_state", false, false);
    833843    PXOPT_LOOKUP_STR(mergedvodb_path,  config->args, "-set_mergedvodb_path", false, false);
    834 
     844    PXOPT_LOOKUP_STR(minidvodb_group,  config->args, "-set_minidvodb_group", false, false);
    835845
    836846
    … …  
    875885 }
    876886
    877 
     887if (minidvodb_group) {
     888if (cnt) {
     889    psStringAppend(&query,comma);
     890  }
     891 psStringAppend(&query, " minidvodb_group = '%s'", minidvodb_group);
     892cnt++;
     893 }
    878894
    879895    // pxUpdateRun gets parameters from config->args and runs the update query
    … …  
    890906
    891907
     908   
    892909    psFree(query);
    893910    psFree(where);
    … …  
    902919    psMetadata *where = psMetadataAlloc();
    903920   
    904     PXOPT_LOOKUP_BOOL(finished_addrun, config->args, "-finished_addrun", false);
    905     if (finished_addrun) { //too many selects, and I couldn't figure out how to rename it
    906       PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidbn", "==");
    907       PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidbg", "==");
    908     } else {
    909       PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "==");
    910       PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "addRun.minidvodb_group", "==");
    911     }
     921    //PXOPT_LOOKUP_BOOL(finished_addrun, config->args, "-finished_addrun", false);
     922    //if (finished_addrun) { //too many selects, and I couldn't figure out how to rename it
     923    // PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidbn", "==");
     924    //  PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidbg", "==");
     925    //} else {
     926      PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "LIKE");
     927      PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodbRun.minidvodb_group", "==");
     928      //pxAddLabelSearchArgs (config, where, "-minidvodb_group", "addRun.minidvodb_group", "==");
     929      // }
    912930    PXOPT_COPY_STR(config->args, where, "-state", "minidvodbRun.state", "==");
    913931    PXOPT_LOOKUP_U64(limit,      config->args, "-limit", false, false);
    914  
     932  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    915933 
    916934
    … …  
    924942 psString query = NULL;
    925943psString query1 = pxDataGet("addtool_find_minidvodbrun.sql");
    926 psString query2 = pxDataGet("addtool_find_minidvodbrun2.sql");
    927  if (finished_addrun) {
    928    psStringAppend(&query, "%s",query2);
    929  } else {
     944//psString query2 = pxDataGet("addtool_find_minidvodbrun2.sql");
     945//if (finished_addrun) {
     946//  psStringAppend(&query, "%s",query2);
     947//} else {
    930948   psStringAppend(&query, "%s",query1);
    931  }
     949   //}
    932950 //psString query = pxDataGet("addtool_find_minidvodbrun.sql");
    933951    if (!query) {
    … …  
    938956
    939957   
    940     if (finished_addrun) { //finished addrun does not need the WHERE
    941       if (psListLength(where->list)) {
    942         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    943         psStringAppend(&query, " AND %s", whereClause);
    944         psFree(whereClause);
    945     } } else {
     958    //if (finished_addrun) { //finished addrun does not need the WHERE
     959    //  if (psListLength(where->list)) {
     960    //    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
     961    //   psStringAppend(&query, " AND %s", whereClause);
     962    //   psFree(whereClause);
     963    // } } else {
    946964      if (psListLength(where->list)) {
    947965        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    … …  
    949967        psFree(whereClause);
    950968      }
    951     }
     969      //}
    952970   
    953 if (!finished_addrun) {
     971    //if (!finished_addrun) {
    954972  //finished_addrun does not need this
    955     psStringAppend(&query, " %s", " GROUP BY minidvodbRun.minidvodb_name ");
    956  }
     973    //   psStringAppend(&query, " %s", " GROUP BY minidvodbRun.minidvodb_name ORDER BY minidvodbRun.minidvodb_name ");
     974    //}
    957975
    958976
    … …  
    967985 
    968986    if (!p_psDBRunQuery(config->dbh, query)) {
    969       psError(PS_ERR_UNKNOWN, false, "database error %s", query);
     987      psError(PS_ERR_UNKNOWN, false, "database error");
    970988        psFree(query);
    971989        return false;
    … …  
    9831001    }
    9841002
    985    if (!ippdbPrintMetadatas(stdout, output, "minidvodbRun", 1)) {
     1003   if (!ippdbPrintMetadatas(stdout, output, "minidvodbRun",  !simple)) {
    9861004        psError(PS_ERR_UNKNOWN, false, "failed to print array");
    9871005        psFree(output);
    … …  
    10661084        if (!minidvodbProcessedInsertObject(config->dbh, row)) {
    10671085          // rollback
    1068         if (!psDBRollback(config->dbh)) {
     1086          if (!psDBRollback(config->dbh)) {
     1087            psError(PS_ERR_UNKNOWN, false, "database error");
     1088          }
    10691089          psError(PS_ERR_UNKNOWN, false, "database error");
    1070         }
    1071         psError(PS_ERR_UNKNOWN, false, "database error");
    1072         psFree(row);
    1073         psFree(pendingRow);
    1074         return false;
     1090          psFree(row);
     1091          psFree(pendingRow);
     1092          return false;
    10751093        }
    10761094
    1077     // since there is only one exp per 'new' set addRun.state = 'full'
    1078     //if (!pxminidvodbRunSetState(config, row->minidvodb_name, "merged")) {
    1079     //  psError(PS_ERR_UNKNOWN, false, "failed to change minidvodbRun.state for minidvodb_name: %" PRId64, row->minidvodb_name);
    1080     //  psFree(row);
    1081     //   psFree(pendingRow);
    1082     //    return false;
    1083     // }
    1084         psFree(row);
    1085         psFree(pendingRow);
     1095        // since there is only one exp per 'new' set addRun.state = 'full'
    10861096       
     1097        //      psString query2 = NULL ;
     1098        //
     1099        //      psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merging' WHERE minidvodb_name = '%s'", row->minidvodb_name);
     1100
     1101        //if (!p_psDBRunQuery(config->dbh, query2)) {
     1102        //  psError(PS_ERR_UNKNOWN, false, "database error");
     1103        //  psFree(query2);
     1104        //  return false;
     1105        //      }
     1106        // psArray *output2 = p_psDBFetchResult(config->dbh);
     1107        //  if (!output2) {
     1108        //psError(PS_ERR_UNKNOWN, false, "database error");
     1109        //return false;
     1110        // }
     1111        // if (!psArrayLength(output2)) {
     1112        //    psTrace("addtool", PS_LOG_INFO, "no rows found");
     1113        //      //     psFree(output2);
     1114        //    return true;
     1115        //  }
     1116
     1117
     1118       
     1119        //      psFree(row);
     1120        //      psFree(pendingRow);
     1121        //     
    10871122        if (!psDBCommit(config->dbh)) {
    10881123          psError(PS_ERR_UNKNOWN, false, "database error");
    … …  
    10911126       
    10921127
    1093 
    1094 
     1128       
     1129       
    10951130        return true;
    1096     }
     1131}
    10971132   
    10981133static bool listminidvodbprocessedMode(pxConfig *config) {

  • branches/haf_branches/ipp.20100512/ippTools/src/addtoolConfig.c

    r27956 r28037  
    9898    psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-add_id", 0,            "define addtool ID (required)", 0);
    9999    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0,            "define base output location", NULL);
     100     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb_path", 0,            "define base output location", NULL);
    100101    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_addstar", 0, "define elapsed time for DVO insertion (seconds)", NAN);
    101102    psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-fault",  0,            "set fault code", 0);
    … …  
    145146    psMetadata *addminidvodbrunArgs = psMetadataAlloc();
    146147    psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name",        0, "define minidvodb_name", NULL);
     148    psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group",        0, "define minidvodb_name", NULL);
    147149    psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path",        0, "define path for minidvodb", NULL);
    148150    psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_mergedvodb_path",        0, "define path for the merged dvodb", NULL);
    … …  
    151153    // -updateminidvodbruns
    152154    psMetadata *updateminidvodbrunArgs = psMetadataAlloc();
    153 psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name",        0, "search by minidvodb_name", NULL);
     155psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group",        0, "search by minidvodb_name (LIKE)", NULL);
     156psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name",        0, "search by minidvodb_name (LIKE)", NULL);
    154157    psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_path",        0, "search by path for minidvodb", NULL);
    155158    psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-mergedvodb_path",        0, "search by path for the merged dvodb", NULL);
     159   
    156160    psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-state",        0, "search by state", NULL);
    157161psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name",        0, "define minidvodb_name", NULL);
    158162    psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path",        0, "define path for minidvodb", NULL);
    159     psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_mergedvodb_path",        0, "define path for the merged dvodb", NULL);
     163    psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_mergedvodb_path",        0, "define path for minidvodb", NULL);
     164    psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group",        0, "define path for the merged dvodb", NULL);
    160165    psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_state",        0, "define state", NULL);
    161166    // -listminidvodbrunArgs
    162167    psMetadata *listminidvodbrunArgs = psMetadataAlloc();
    163     psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name",        0, "search by minidvodb_name", NULL);
    164     psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group",        0, "search by addRun.minidvodb_group", NULL);
     168    psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name",        0, "search by minidvodb_name (LIKE)", NULL);
     169    psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group",     0,    "search by addRun.minidvodb_group", NULL);
    165170    psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-state",        0, "search by state", NULL);
    166171    psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-limit",        0, "limit to N items", 0);
    167172    psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-simple",        0, "simple output", false);
    168     psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-finished_addrun",        0, "limit to minidvodbs with completed addRuns (none in new state)", false);
     173    //psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-finished_addrun",        0, "limit to minidvodbs with completed addRuns (none in new state)", false);
    169174
    170175    psMetadata *addminidvodbprocessedArgs = psMetadataAlloc();
Note: See TracChangeset for help on using the changeset viewer.