Changeset 35350 for branches/eam_branches/ipp-20130307/ippTools/src/pstamptool.c

Timestamp:

Apr 2, 2013, 3:01:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130307

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pstamptool.c (modified) (7 diffs)

branches/eam_branches/ipp-20130307/ippTools/src/pstamptool.c

@@ -287 +287 @@
     PXOPT_LOOKUP_S64(ds_id,       config->args, "-ds_id", false, false);
 
+    PXOPT_LOOKUP_STR(username,    config->args, "-username",  false, false);
+    PXOPT_LOOKUP_S64(proj_id,     config->args, "-proj_id", false, false);
+
+    psTime *now = psTimeGetNow(PS_TIME_TAI);
+
     if (!pstampRequestInsert(config->dbh,
         0,      // req_id
@@ -297 +302 @@
         uri,
         NULL,   // outdir
-        NULL,   // timestamp
+        username,
+        proj_id,
+        now,    // registered
+        now,    // timestamp
         0       // fault
         )) {
@@ -444 +452 @@
     PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
     PXOPT_COPY_S64(config->args, where, "-not_req_id", "req_id", "!=");
-    PXOPT_COPY_STR(config->args, where, "-name", "name", "==");
+    PXOPT_COPY_STR(config->args, where, "-name", "name", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-username", "username", "==");
+    PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
 
     PXOPT_LOOKUP_U64(limit,   config->args, "-limit",  false, false);
@@ -450 +460 @@
 
     if (!psListLength(where->list)) {
-        psError(PS_ERR_UNKNOWN, true, "-req_id or -name must be supplied");
+        psError(PS_ERR_UNKNOWN, true, "search paramters are required");
         return false;
     }
@@ -482 +492 @@
     if (!psArrayLength(output)) {
         psTrace("pstamptool", PS_LOG_INFO, "request not found");
-        // This causes main to exit with PS_EXIT_DATA_ERROR which the script is looking for
+        // This causes main to exit with PS_EXIT_DATA_ERROR which the pstamp scripts are looking for
         psError(PXTOOLS_ERR_CONFIG, true, "request not found");
         psFree(output);
-        // we return false so that the caller can determine that a request does not exist
+        // we return false so that the caller can easily determine that a request does not exist
         return false;
     }
@@ -567 +577 @@
     PXOPT_LOOKUP_STR(label,      config->args, "-set_label",      false, false);
     PXOPT_LOOKUP_STR(outProduct, config->args, "-set_outProduct", false, false);
-    PXOPT_LOOKUP_S16(fault,      config->args, "-set_fault",          false, false);
+    PXOPT_LOOKUP_S16(fault,      config->args, "-set_fault",      false, false);
     PXOPT_LOOKUP_STR(uri,        config->args, "-set_uri",        false, false);
-    PXOPT_LOOKUP_STR(outdir,     config->args, "-set_outdir",        false, false);
+    PXOPT_LOOKUP_STR(outdir,     config->args, "-set_outdir",     false, false);
     PXOPT_LOOKUP_STR(name,       config->args, "-set_name",       false, false);
+    PXOPT_LOOKUP_STR(username,   config->args, "-set_username",   false, false);
     PXOPT_LOOKUP_STR(reqType,    config->args, "-set_reqType",    false, false);
-    PXOPT_LOOKUP_BOOL(clearfault,config->args, "-clearfault",    false);
-
-    if (!state && !label && !outProduct && !fault && !uri && !outdir && !name && !reqType && !clearfault) {
+    PXOPT_LOOKUP_BOOL(clearfault,config->args, "-clearfault",     false);
+
+    if (!state && !label && !outProduct && !fault && !uri && !outdir && !name && !username && !reqType && !clearfault) {
         psError(PS_ERR_UNKNOWN, true, "at least one set option is required");
         return false;
@@ -584 +595 @@
     PXOPT_COPY_S32(config->args, where, "-fault",      "fault", "==");
     PXOPT_COPY_STR(config->args, where, "-state",      "state", "==");
-    PXOPT_COPY_STR(config->args, where, "-reqType",     "reqType", "==");
-    PXOPT_COPY_STR(config->args, where, "-name",     "name", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-reqType",    "reqType", "==");
+    PXOPT_COPY_STR(config->args, where, "-name",       "name", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-username",   "username", "==");
     PXOPT_COPY_TIME(config->args, where, "-timestamp_begin", "timestamp", ">=");
     PXOPT_COPY_TIME(config->args, where, "-timestamp_end", "timestamp", "<=");