Changeset 35293

Timestamp:

Mar 11, 2013, 1:11:51 PM (13 years ago)

Author:

bills

Message:

add usrname, proj_id, and registered to pstampRequest. Make group_id a key in ippRelase

Location:

tags/ipp-20130307

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/pstamp.md (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (3 diffs)
• ippTools/src/pstamptool.c (modified) (3 diffs)
• ippTools/src/pstamptoolConfig.c (modified) (2 diffs)

tags/ipp-20130307/dbconfig/changes.txt

@@ -2399 +2399 @@
 UPDATE dbversion set schema_version = '1.1.75', updated= CURRENT_TIMESTAMP();
 
+-- new Postage Stamp Request columns (NOTE these changes to not apply to gpc1
+-- because the pstamp tables have been dropped from that database
+ALTER TABLE pstampRequest ADD COLUMN username VARCHAR(255) AFTER outdir;
+ALTER TABLE pstampRequest ADD COLUMN proj_id BIGINT AFTER username;
+ALTER TABLE pstampRequest ADD COLUMN registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER proj_id;
+
+-- default to the gpc1 project (or is it ps1?)
+UPDATE pstampRequest SET proj_id = 1;
+
+
+

tags/ipp-20130307/dbconfig/pstamp.md

@@ -32 +32 @@
     uri         STR         255
     outdir      STR         255
+    username    STR         255
+    proj_id     S64         0
+    registered  UTC         0001-01-01T00:00:00Z
     timestamp   UTC         0001-01-01T00:00:00Z
     fault       S32         0

tags/ipp-20130307/ippTools/share/pxadmin_create_tables.sql

@@ -1441 +1441 @@
         outProduct VARCHAR(64),
         uri VARCHAR(255),
-        outdir     VARCHAR(255),
+        outdir VARCHAR(255),
+        username VARCHAR(255),
+        proj_id BIGINT,
+        registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         timestamp TIMESTAMP,
         fault SMALLINT,
@@ -1448 +1451 @@
         KEY(state),
         KEY(fault),
-        KEY(label)
+        KEY(label),
+        KEY(username)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -2194 +2198 @@
     KEY (state),
     KEY (fault),
+    KEY (group_id),
     FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id),
     FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id),

tags/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
         )) {
@@ -567 +575 @@
     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;

tags/ipp-20130307/ippTools/src/pstamptoolConfig.c

@@ -74 +74 @@
     psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-uri", 0,    "define request file uri (required)", NULL);
     psMetadataAddS64(addreqArgs, PS_LIST_TAIL, "-ds_id", 0,  "define request ds_id", 0);
+    psMetadataAddS64(addreqArgs, PS_LIST_TAIL, "-proj_id", 0, "define request proj_id", 0);
     psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-name", 0,   "define request name", NULL);
+    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-username", 0, "define user name", NULL);
     psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-label", 0,  "define request label", NULL);
 
@@ -116 +118 @@
     psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_uri", 0,          "new uri", NULL);
     psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_name", 0,         "new name", NULL);
+    psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_username", 0,     "new username", NULL);
     psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_reqType", 0,      "new reqType", NULL);
     psMetadataAddBool(updatereqArgs, PS_LIST_TAIL, "-clearfault", 0,      "set fault to zero", false);