Changeset 27838 for branches/tap_branches/ippTools/src/receivetool.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/receivetool.c (modified) (12 diffs)

branches/tap_branches/ippTools/src

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr

branches/tap_branches/ippTools/src/receivetool.c

@@ -105 +105 @@
     // optional
     PXOPT_LOOKUP_STR(comment, config->args, "-comment",  false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-state",  false, false);
     PXOPT_LOOKUP_STR(last, config->args, "-last",  false, false);
     PXOPT_LOOKUP_STR(status_product, config->args, "-status_product",  false, false);
@@ -110 +111 @@
     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)) {
+    if (!receiveSourceInsert(config->dbh, 0, source, product, workdir, state, comment, last, status_product, ds_dbname, ds_dbhost)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;
@@ -135 +136 @@
     psString query = pxDataGet("receivetool_list.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;
@@ -142 +143 @@
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " WHERE %s", whereClause);
+        psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
     }
@@ -194 +195 @@
     psString query = pxDataGet("receivetool_addfileset.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "Failed to retreive SQL statement");
         return false;
     }
@@ -301 +302 @@
     psString query = pxDataGet("receivetool_pendingfileset.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;
@@ -380 +381 @@
         psString file_type = psMetadataLookupStr(NULL, md, "file_type");
         psString component = psMetadataLookupStr(NULL, md, "component");
-        
+
         if (!file) {
             psError(PS_ERR_UNKNOWN, false, "failed to find value for file");
@@ -430 +431 @@
     psString query = pxDataGet("receivetool_pendingfile.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;
@@ -513 +514 @@
     psString query = pxDataGet("receivetool_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;
@@ -546 +547 @@
     psString query = pxDataGet("receivetool_toadvance.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;
@@ -612 +613 @@
     psString query = NULL;              // Query to execute
     psStringAppend(&query, "UPDATE receiveFileset SET ");
-    
+
     psString sep = "";
     if (fault) {
@@ -630 +631 @@
         sep = ",";
     }
-    
+
     psStringAppend(&query, " WHERE fileset_id = %" PRId64, fileset_id);
 

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr