Changeset 36896

Timestamp:

Jun 17, 2014, 5:42:02 PM (12 years ago)

Author:

watersc1

Message:

Merged version

File:

• trunk/ippTools/src/remotetool.c (modified) (5 diffs)

trunk/ippTools/src/remotetool.c

@@ -95 +95 @@
   // Get a list of the things we can insert into a new component
   psString query = NULL;
+  psString whereOption = psStringCopy("");
   if (!strcmp(stage,"chip")) {
     query = pxDataGet("remotetool_definebyquery_chip.sql");
@@ -125 +126 @@
     
     if (label) {
-      psStringAppend(&query, " AND (warpRun.label = '%s')", label);
+      // Because warp has to check to see if something other than the state is set correctly, I have to use this wonky way to pass the label in.
+      //      psStringAppend(&query, " AND (warpRun.label = '%s')", label);
+      psStringAppend(&whereOption, "\n AND (warpRun.label = '%s')", label);
     }
   }    
@@ -149 +152 @@
     psFree(limitString);
   }
-  if (!p_psDBRunQuery(config->dbh, query)) {
+  if (!p_psDBRunQueryF(config->dbh, query,whereOption)) {
     psError(PS_ERR_UNKNOWN, false, "database error");
     psFree(query);
@@ -313 +316 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  // PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
+  PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
+  psAssert(remote_id,"This should have failed before this point.");
   
   psMetadata *where = psMetadataAlloc();
@@ -341 +345 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  // PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
-  
+  PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
+  psAssert(remote_id,"This should have failed before this point.");
+
   psMetadata *where = psMetadataAlloc();
   // Wheres