Index: trunk/ippTools/src/Makefile.am =================================================================== --- trunk/ippTools/src/Makefile.am (revision 24014) +++ trunk/ippTools/src/Makefile.am (revision 24038) @@ -19,7 +19,6 @@ regtool \ stacktool \ - warptool - -# receivetool + warptool \ + receivetool Index: trunk/ippTools/src/receivetool.c =================================================================== --- trunk/ippTools/src/receivetool.c (revision 24014) +++ trunk/ippTools/src/receivetool.c (revision 24038) @@ -1,4 +1,4 @@ /* - * disttool.c + * receivetool.c * * Copyright (C) 2008 @@ -36,7 +36,9 @@ static bool updatelastMode(pxConfig *config); static bool pendingfilesetMode(pxConfig *config); +static bool updatefilesetMode(pxConfig *config); static bool addfileMode(pxConfig *config); static bool pendingfileMode(pxConfig *config); static bool addresultMode(pxConfig *config); +static bool toadvanceMode(pxConfig *config); static bool revertMode(pxConfig *config); @@ -65,4 +67,6 @@ MODECASE(RECEIVETOOL_MODE_UPDATELAST, updatelastMode); MODECASE(RECEIVETOOL_MODE_PENDINGFILESET, pendingfilesetMode); + MODECASE(RECEIVETOOL_MODE_UPDATEFILESET, updatefilesetMode); + MODECASE(RECEIVETOOL_MODE_TOADVANCE, toadvanceMode); MODECASE(RECEIVETOOL_MODE_ADDFILE, addfileMode); MODECASE(RECEIVETOOL_MODE_PENDINGFILE, pendingfileMode); @@ -102,6 +106,9 @@ PXOPT_LOOKUP_STR(comment, config->args, "-comment", false, false); PXOPT_LOOKUP_STR(last, config->args, "-last", false, false); - - if (!receiveSourceInsert(config->dbh, 0, source, product, workdir, comment, last)) { + PXOPT_LOOKUP_STR(status_product, config->args, "-status_product", false, false); + PXOPT_LOOKUP_STR(ds_dbname, config->args, "-ds_dbname", false, false); + PXOPT_LOOKUP_STR(ds_dbhost, config->args, "-ds_dbhost", false, false); + + if (!receiveSourceInsert(config->dbh, 0, source, product, workdir, comment, last, status_product, ds_dbname, ds_dbhost)) { psError(PS_ERR_UNKNOWN, false, "Database error"); return false; @@ -231,5 +238,5 @@ psFree(output); - if (!receiveFilesetInsert(config->dbh, 0, source_id, fileset)) { + if (!receiveFilesetInsert(config->dbh, 0, source_id, fileset, "new", NULL, 0)) { psError(PS_ERR_UNKNOWN, false, "Unable to add fileset"); psFree(source_id_str); @@ -391,5 +398,6 @@ PXOPT_COPY_STR(config->args, where, "-product", "receiveSource.product", "=="); PXOPT_COPY_STR(config->args, where, "-comment", "receiveSource.comment", "LIKE"); - PXOPT_COPY_S64(config->args, where, "-fileset_id", "receiveFile.file_id", "=="); + PXOPT_COPY_S64(config->args, where, "-fileset_id", "receiveFile.fileset_id", "=="); + PXOPT_COPY_S64(config->args, where, "-file_id", "receiveFile.file_id", "=="); // optional @@ -499,2 +507,104 @@ return true; } +static bool toadvanceMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); // WHERE conditions + + // optional + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + psString query = pxDataGet("receivetool_toadvance.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement"); + psFree(where); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + + if (!p_psDBRunQueryF(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "Database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "Database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("receivetool", PS_LOG_INFO, "No rows found"); + psFree(output); + return true; + } + if (!ippdbPrintMetadatas(stdout, output, "toadvanceFilesets", !simple)) { + psError(PS_ERR_UNKNOWN, false, "Failed to print array"); + psFree(output); + return false; + } + psFree(output); + + return true; +} + +static bool updatefilesetMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + // required + PXOPT_LOOKUP_S64(fileset_id, config->args, "-fileset_id", true, false); + + // to chanage + PXOPT_LOOKUP_S32(fault, config->args, "-fault", false, false); + PXOPT_LOOKUP_STR(dbinfo_uri, config->args, "-dbinfo_uri", false, false); + PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); + + if (!fault && !dbinfo_uri && !state) { + psError(PS_ERR_UNKNOWN, true, "one of -fault, -dbinfo_uri, -set_state are required"); + return false; + } + + psString query = NULL; // Query to execute + psStringAppend(&query, "UPDATE receiveFileset SET "); + + psString sep = ""; + if (fault) { + psStringAppend(&query, "%s fault = %d", sep, fault); + sep = ","; + } + if (dbinfo_uri) { + psStringAppend(&query, "%s dbinfo_uri = '%s'", sep, dbinfo_uri); + sep = ","; + } + if (state) { + psStringAppend(&query, "%s state = '%s'", sep, state); + sep = ","; + } + + psStringAppend(&query, " WHERE fileset_id = %" PRId64, fileset_id); + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "Database error"); + psFree(query); + return false; + } + psFree(query); + + return true; +} Index: trunk/ippTools/src/receivetool.h =================================================================== --- trunk/ippTools/src/receivetool.h (revision 24014) +++ trunk/ippTools/src/receivetool.h (revision 24038) @@ -30,4 +30,6 @@ RECEIVETOOL_MODE_UPDATELAST, RECEIVETOOL_MODE_PENDINGFILESET, + RECEIVETOOL_MODE_UPDATEFILESET, + RECEIVETOOL_MODE_TOADVANCE, RECEIVETOOL_MODE_ADDFILE, RECEIVETOOL_MODE_PENDINGFILE, Index: trunk/ippTools/src/receivetoolConfig.c =================================================================== --- trunk/ippTools/src/receivetoolConfig.c (revision 24014) +++ trunk/ippTools/src/receivetoolConfig.c (revision 24038) @@ -50,4 +50,7 @@ psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-comment", 0, "define comment", NULL); psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-last", 0, "define last fileset", NULL); + psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-status_product", 0, "define status_product", NULL); + psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-ds_dbname", 0, "define ds_dbname", NULL); + psMetadataAddStr(definesourceArgs, PS_LIST_TAIL, "-ds_dbhost", 0, "define ds_dbhost", NULL); // -list @@ -74,6 +77,14 @@ psMetadataAddStr(pendingfilesetArgs, PS_LIST_TAIL, "-product", 0, "search on product", NULL); psMetadataAddStr(pendingfilesetArgs, PS_LIST_TAIL, "-comment", 0, "search on comment (LIKE)", NULL); + psMetadataAddBool(pendingfilesetArgs, PS_LIST_TAIL, "-simple", 0, "use simple output format?", false); psMetadataAddU64(pendingfilesetArgs, PS_LIST_TAIL, "-limit", 0, "limit result set", 0); - psMetadataAddBool(pendingfilesetArgs, PS_LIST_TAIL, "-simple", 0, "use simple output format?", false); + psMetadataAddStr(pendingfilesetArgs, PS_LIST_TAIL, "-label", 0, "search on label", NULL); + + // -updatefileset + psMetadata *updatefilesetArgs = psMetadataAlloc(); + psMetadataAddS64(updatefilesetArgs, PS_LIST_TAIL, "-fileset_id", 0, "define fileset_id (required)", 0); + psMetadataAddStr(updatefilesetArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); + psMetadataAddStr(updatefilesetArgs, PS_LIST_TAIL, "-dbinfo_uri", 0, "define dbinfo_uri", NULL); + psMetadataAddS32(updatefilesetArgs, PS_LIST_TAIL, "-fault", 0, "define fault code", 0); // -addfile @@ -88,6 +99,8 @@ psMetadataAddStr(pendingfileArgs, PS_LIST_TAIL, "-comment", 0, "search on comment (LIKE)", NULL); psMetadataAddS64(pendingfileArgs, PS_LIST_TAIL, "-fileset_id", 0, "search on fileset_id", 0); + psMetadataAddS64(pendingfileArgs, PS_LIST_TAIL, "-file_id", 0, "search on file_id", 0); psMetadataAddU64(pendingfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set", 0); psMetadataAddBool(pendingfileArgs, PS_LIST_TAIL, "-simple", 0, "use simple output format?", false); + psMetadataAddStr(pendingfileArgs, PS_LIST_TAIL, "-label", 0, "search on label", NULL); // -addresult @@ -107,4 +120,13 @@ psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-comment", 0, "search on comment (LIKE)", NULL); + // -toadvance + psMetadata *toadvanceArgs = psMetadataAlloc(); + psMetadataAddS64(toadvanceArgs, PS_LIST_TAIL, "-fileset_id", 0, "search on fileset_id", 0); + psMetadataAddS64(toadvanceArgs, PS_LIST_TAIL, "-source_id", 0, "search on source_id", 0); + psMetadataAddU64(toadvanceArgs, PS_LIST_TAIL, "-limit", 0, "limit result set", 0); + psMetadataAddBool(toadvanceArgs, PS_LIST_TAIL, "-simple", 0, "use simple output format?", false); + // label is not used but pantasks requires it + psMetadataAddStr(toadvanceArgs, PS_LIST_TAIL, "-label", 0, "search on label", NULL); + psMetadata *argSets = psMetadataAlloc(); psMetadata *modes = psMetadataAlloc(); @@ -114,5 +136,7 @@ PXOPT_ADD_MODE("-addfileset", "", RECEIVETOOL_MODE_ADDFILESET, addfilesetArgs); PXOPT_ADD_MODE("-updatelast", "", RECEIVETOOL_MODE_UPDATELAST, updatelastArgs); + PXOPT_ADD_MODE("-updatefileset", "", RECEIVETOOL_MODE_UPDATEFILESET, updatefilesetArgs); PXOPT_ADD_MODE("-pendingfileset", "", RECEIVETOOL_MODE_PENDINGFILESET, pendingfilesetArgs); + PXOPT_ADD_MODE("-toadvance", "", RECEIVETOOL_MODE_TOADVANCE, toadvanceArgs); PXOPT_ADD_MODE("-addfile", "", RECEIVETOOL_MODE_ADDFILE, addfileArgs); PXOPT_ADD_MODE("-pendingfile", "", RECEIVETOOL_MODE_PENDINGFILE, pendingfileArgs);