Changeset 34241 for branches/eam_branches/ipp-20120627/ippTools/src/disttool.c

Timestamp:

Jul 31, 2012, 11:38:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/ippTools/src

Files:

• . (modified) (1 prop)
• disttool.c (modified) (2 diffs)

branches/eam_branches/ipp-20120627/ippTools/src/disttool.c

@@ -743 +743 @@
 
     query = "DELETE FROM distComponent where dist_id = %" PRId64;
+    char *query2 =  "DELETE from rcDSFileset using distRun, rcDSFileset WHERE distRun.dist_id = rcDSFileset.dist_id AND rcDSFileset.state ='cleaned' AND dist_id = %" PRId64;
     
     for (long i=0; i < psArrayLength(output); i++) {
@@ -753 +754 @@
         }
 
+        // delete any existing distComponents
         if (!p_psDBRunQueryF(config->dbh, query, dist_id)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(query);
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+        // delete any exisiting fileset
+        if (!p_psDBRunQueryF(config->dbh, query2, dist_id)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(query);