Changeset 27840 for branches/simtest_nebulous_branches/ippTools/src/pubtool.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pubtool.c (modified) (10 diffs)

branches/simtest_nebulous_branches/ippTools/src

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool

branches/simtest_nebulous_branches/ippTools/src/pubtool.c

@@ -32 +32 @@
 
 static bool defineclientMode(pxConfig *config);
+static bool updateclientMode(pxConfig *config);
 static bool definerunMode(pxConfig *config);
 static bool pendingMode(pxConfig *config);
@@ -57 +58 @@
     switch (config->mode) {
         MODECASE(PUBTOOL_MODE_DEFINECLIENT, defineclientMode);
+        MODECASE(PUBTOOL_MODE_UPDATECLIENT, updateclientMode);
         MODECASE(PUBTOOL_MODE_DEFINERUN, definerunMode);
         MODECASE(PUBTOOL_MODE_PENDING, pendingMode);
@@ -93 +95 @@
     // optional
     PXOPT_LOOKUP_STR(comment, config->args, "-comment",  false, false);
-
-    if (!publishClientInsert(config->dbh, 0, product, stage, workdir, comment)) {
-        psError(PS_ERR_UNKNOWN, false, "Database error");
-        return false;
-    }
+    PXOPT_LOOKUP_BOOL(unmagicked, config->args, "-unmagicked",  false);
+
+    if (!publishClientInsert(config->dbh, 0, 0, product, stage, !unmagicked, workdir, comment)) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
+        return false;
+    }
+
+    return true;
+}
+
+static bool updateclientMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc(); // WHERE conditions
+    PXOPT_COPY_S64(config->args, where, "-client_id", "client_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-product", "product", "==");
+    PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
+    PXOPT_COPY_STR(config->args, where, "-comment", "comment", "LIKE");
+
+    PXOPT_LOOKUP_BOOL(active, config->args, "-active",  false);
+    PXOPT_LOOKUP_BOOL(inactive, config->args, "-inactive",  false);
+
+    if ((!active && !inactive) || (active && inactive)) {
+        psError(PS_ERR_UNKNOWN, false, "Must specify one, and only one, of -active and -inactive.");
+        psFree(where);
+        return false;
+    }
+
+    psString query = NULL;              // Query to run
+    psStringAppend(&query, "UPDATE publishClient SET active = %d", active ? 1 : 0);
+
+    if (psListLength(where->list)) {
+        psString clause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, "\n WHERE %s", clause);
+        psFree(clause);
+    }
+    psFree(where);
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    long numUpdated = psDBAffectedRows(config->dbh);
+    psLogMsg("pubtool", PS_LOG_INFO, "%ld rows updated.", numUpdated);
 
     return true;
@@ -112 +157 @@
     // optional
     PXOPT_COPY_S64(config->args, where, "-client_id", "client_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
-
-    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
+    pxAddLabelSearchArgs(config, where, "-label", "label", "=="); // define using newExp label
 
     psString query = pxDataGet("pubtool_definerun.sql"); // Query to run
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "Failed to retreive SQL statement");
         psFree(where);
         return false;
@@ -167 +210 @@
         psS64 client = psMetadataLookupS64(NULL, row, "client_id"); // Client identifier
         psS64 stage = psMetadataLookupS64(NULL, row, "stage_id");   // Stage identifier
+        char *label = psMetadataLookupStr(NULL, row, "src_label");   // label from correct source
 
         if (!publishRunInsert(config->dbh, 0, client, stage, label, "new")) {
@@ -205 +249 @@
     psString query = pxDataGet("pubtool_pending.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "Failed to retreive SQL statement");
         psFree(where);
         return false;
@@ -259 +303 @@
     // required
     PXOPT_LOOKUP_S64(pub_id, config->args, "-pub_id", true, false);
-    PXOPT_LOOKUP_STR(path_base, config->args, "-path_base",  true, false);
+    PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", true, false);
 
     // optional
+    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
+    PXOPT_LOOKUP_F32(dtime_script, config->args, "-dtime_script", false, false);
     PXOPT_LOOKUP_S32(fault, config->args, "-fault", false, false);
 
@@ -269 +315 @@
     }
 
-    if (!publishDoneInsert(config->dbh, pub_id, path_base, fault)) {
+    if (!publishDoneInsert(config->dbh, pub_id, path_base, hostname, dtime_script, fault)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to add file");
         if (!psDBRollback(config->dbh)) {
@@ -309 +355 @@
     PXOPT_COPY_STR(config->args, where, "-client_id", "publishClient.client_id", "==");
     PXOPT_COPY_STR(config->args, where, "-comment", "publishClient.comment", "LIKE");
-    PXOPT_COPY_STR(config->args, where, "-label", "publishRun.label", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "publishRun.label", "==");
 
     psString query = pxDataGet("pubtool_revert.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "Failed to retreive SQL statement");
         psFree(where);
         return false;
@@ -332 +378 @@
     psFree(query);
 
-    return true;
-}
-
+    psLogMsg("pubtool", PS_LOG_INFO, "Deleted %" PRIu64 " rows", psDBAffectedRows(config->dbh));
+
+    return true;
+}
+

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool