Changeset 36512 for trunk/ippTools/src/remotetool.c

Timestamp:

Feb 13, 2014, 6:00:46 PM (12 years ago)

Author:

watersc1

Message:

Fixed all the typos and mistakes, and I think this works as intended now. Seemed to be able to get the necessary information to the prepare_chip script.

File:

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

trunk/ippTools/src/remotetool.c

@@ -184 +184 @@
 
   // Insert the top level run object
-  remoteRunRow *run = remoteRunRowAlloc(0, // rem_id
+  remoteRunRow *run = remoteRunRowAlloc(0, // remote_id
                                         "new", // state
                                         stage,
@@ -206 +206 @@
     return(true);
   }
-  psS64 rem_id = psDBLastInsertID(config->dbh);
+  psS64 remote_id = psDBLastInsertID(config->dbh);
   
   psArray *list = psArrayAllocEmpty(limit);
@@ -213 +213 @@
     psS64 stage_id = psMetadataLookupS64(NULL, md, "stage_id");
 
-    remoteComponentRow *comp = remoteComponentRowAlloc(rem_id,
+    remoteComponentRow *comp = remoteComponentRowAlloc(remote_id,
                                                        stage_id);
     if (!comp) {
@@ -260 +260 @@
   psMetadata *where = psMetadataAlloc();
   
-  PXOPT_COPY_S64(config->args, where, "-rem_id", "rem_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
   PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
   PXOPT_COPY_STR(config->args, where, "-stage",  "stage",  "==");
@@ -292 +292 @@
   psMetadata *where = psMetadataAlloc();
 
-  PXOPT_COPY_S64(config->args, where, "-rem_id", "rem_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
   
@@ -313 +313 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-
+  PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
+  
   psMetadata *where = psMetadataAlloc();
   psMetadata *values = psMetadataAlloc();
 
   // Wheres
-  PXOPT_COPY_S64(config->args, where, "-rem_id", "rem_id", "==");
-  PXOPT_COPY_STR(config->args, where, "-label",  "label", "==");
-
+  PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
+  
   // Values to set
+  PXOPT_COPY_STR(config->args, values, "-set_label", "label", "==");
   PXOPT_COPY_STR(config->args, values, "-set_state", "state", "==");
   PXOPT_COPY_S16(config->args, values, "-fault",     "fault", "==");
-  PXOPT_COPY_STR(config->args, values, "-set_label", "label", "==");
+  PXOPT_COPY_S64(config->args, values, "-job_id",    "job_id", "==");
 
   long rows = psDBUpdateRows(config->dbh, "remoteRun", where, values);
@@ -340 +341 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-
+  PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
+  
   psMetadata *where = psMetadataAlloc();
   // Wheres
-  PXOPT_COPY_S64(config->args, where, "-rem_id", "rem_id", "==");
-
+  PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
+  psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+  psFree(where);
+  
   psString query = NULL;
   query = pxDataGet("remotetool_updatepoll.sql");
   if (!query) {
     psError(PXTOOLS_ERR_SYS,false, "failed to retreive SQL statement");
-    psFree(where);
+    psFree(whereClause);
     return(false);
   }
 
-  if (!p_psDBRunQueryF(config->dbh, query,where)) {
+  if (!p_psDBRunQueryF(config->dbh, query,whereClause)) {
     psError(PS_ERR_UNKNOWN, false, "database error");
     psFree(query);
+    psFree(whereClause);
     return false;
   }
   psFree(query);
-  psFree(where);
+  psFree(whereClause);
   return(true);
 }
@@ -374 +379 @@
 
   // required
-  PXOPT_COPY_S64(config->args, where, "-rem_id", "rem_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
   PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
   
@@ -398 +403 @@
 
   // required
-  PXOPT_COPY_S64(config->args, where, "-rem_id", "rem_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-remote_id", "remote_id", "==");
   PXOPT_COPY_STR(config->args, where, "-label", "label", "==");