Changeset 29526 for branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c

Timestamp:

Oct 22, 2010, 3:18:51 PM (16 years ago)

Author:

heather

Message:

minidvodbcopy now works

File:

• branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c (modified) (4 diffs)

branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c

@@ -255 +255 @@
   PXOPT_COPY_STR(config->args, where, "-minidvodbcopy_id", "minidvodbCopy.minidvodbcopy_id", "==");
   PXOPT_COPY_STR(config->args, where, "-destination_host", "minidvodbCopy.destination_host", "==");
+  PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodbRun.minidvodb_group", "==");
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  PXOPT_LOOKUP_BOOL(pending, config->args, "-pending", false);
   PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false);
   if (!psListLength(where->list)) {
@@ -294 +296 @@
     }
     psFree(where);
+
+    if (pending) {
+       //add the cuts for pending (state new, no faults)
+      psStringAppend(&query, " %s", " AND minidvodbCopy.state = 'new' AND minidvodbCopy.fault = 0 AND minidvodbCopy.destination_host IS NOT NULL AND minidvodbCopy.minidvodb_rsync_path IS NOT NULL");
+    }
+
 
     // order by epoch
@@ -343 +351 @@
   PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbCopy.minidvodb_id", "==");
   PXOPT_COPY_STR(config->args, where, "-destination_host", "destination_host", "==");
+  PXOPT_COPY_S16(config->args, where, "-fault", "minidvodbCopy.fault", "==");
 
   if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
@@ -472 +481 @@
   }
 
- 
-
-  psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
   psStringAppend(&query, " WHERE %s", whereClause);
 
+  
   if (!p_psDBRunQuery(config->dbh, query)) {
     psError(PS_ERR_UNKNOWN, false, "database error %s", query);