Changeset 17802

Timestamp:

May 23, 2008, 5:09:17 PM (18 years ago)

Author:

Paul Price

Message:

Adding hostname to registration

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/tasks.md (modified) (3 diffs)
• ippTools/src/regtool.c (modified) (4 diffs)
• ippTools/src/regtoolConfig.c (modified) (7 diffs)

trunk/dbconfig/changes.txt

@@ -157 +157 @@
 ALTER TABLE warpSkyfile ADD COLUMN (xmin INT, xmax INT, ymin INT, ymax INT);
 ALTER TABLE diffSkyfile ADD COLUMN (stamps_num INT, stamps_rms FLOAT, sources INT);
+ALTER TABLE rawImfile ADD COLUMN hostname VARCHAR(64) AFTER solang;
+ALTER TABLE diffSkyfile ADD COLUMN hostname VARCHAR(64) AFTER object;

trunk/dbconfig/tasks.md

@@ -1 @@
-# $Id: tasks.md,v 1.151 2008-05-22 21:17:33 jhoblitt Exp $
+# $Id: tasks.md,v 1.152 2008-05-24 03:09:11 price Exp $
 
 # this table records all exposure ID ever seen from the summit
@@ -154 +154 @@
     object      STR         64
     solang      F32         0.0
+    hostname    STR         64
     fault       S16         0       # Key NOT NULL
 END
@@ -212 +213 @@
     user_5      F64         0.0
     object      STR         64
-    fault       S16         0       # Key NOT NULL
-END
+    hostname    STR         64
+    fault       S16         0       # Key NOT NULL
+END

trunk/ippTools/src/regtool.c

@@ -223 +223 @@
     PXOPT_LOOKUP_STR(object, config->args, "-object", false, false);
     PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
+    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
@@ -278 +279 @@
         user_5,
         object,
+        hostname,
         code
     )) {
@@ -548 +550 @@
     PXOPT_LOOKUP_STR(object, config->args, "-object", false, false);
     PXOPT_LOOKUP_STR(label,  config->args, "-label", false, false);
+    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
 
@@ -696 +699 @@
         object,
         0.0,
+        hostname,
         code
     )) {

trunk/ippTools/src/regtoolConfig.c

@@ -30 +30 @@
 #include "regtool.h"
 
-#define ADD_OPT(TYPE,TARG,NAME,COMMENT,DEFAULT) psMetadataAdd##TYPE(TARG, PS_LIST_TAIL, NAME, 0, COMMENT, DEFAULT)    
+#define ADD_OPT(TYPE,TARG,NAME,COMMENT,DEFAULT) psMetadataAdd##TYPE(TARG, PS_LIST_TAIL, NAME, 0, COMMENT, DEFAULT)
 
 pxConfig *regtoolConfig(pxConfig *config, int argc, char **argv)
@@ -62 +62 @@
     psMetadata *addprocessedimfileArgs = psMetadataAlloc();
     ADD_OPT(Str,  addprocessedimfileArgs, "-exp_id",         "define exposure ID (required)",        NULL);
-    ADD_OPT(Str,  addprocessedimfileArgs, "-exp_name",       "define the exp_name (required)",         NULL); 
+    ADD_OPT(Str,  addprocessedimfileArgs, "-exp_name",       "define the exp_name (required)",         NULL);
     ADD_OPT(Str,  addprocessedimfileArgs, "-inst",           "define the camera name (required)",     NULL);
     ADD_OPT(Str,  addprocessedimfileArgs, "-telescope",      "define the telescope name (required)",     NULL);
@@ -112 +112 @@
     ADD_OPT(Str,  addprocessedimfileArgs, "-object",         "define exposure object",             NULL);
     ADD_OPT(Time, addprocessedimfileArgs, "-dateobs",        "define observation time",         NULL);
+    ADD_OPT(Str,  addprocessedimfileArgs, "-hostname",       "define host name",                NULL);
     ADD_OPT(S16,  addprocessedimfileArgs, "-code",           "set fault code",                  0);
 
@@ -150 +151 @@
     // -addprocessedexp
     psMetadata *addprocessedexpArgs = psMetadataAlloc();
-    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id",           0,        "exp_id to operate on (required)", NULL); 
-    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_name",         0,        "define the exp_name (required)", NULL); 
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id",           0,        "exp_id to operate on (required)", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_name",         0,        "define the exp_name (required)", NULL);
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-inst",             0,        "define the camera name (required)", NULL);
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-telescope",        0,        "define the telescope name (required)", NULL);
@@ -205 +206 @@
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-object",           0,        "define exposure object", NULL);
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-label",            0,        "define label for chip stage (non-detrend data only)", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-hostname",         0,        "define host name", NULL);
     psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code",             0,        "set fault code", 0);
     /*
@@ -265 +267 @@
     psMetadataAddStr(updatedprocessedexpArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", NULL);
     psMetadataAddS16(updatedprocessedexpArgs, PS_LIST_TAIL, "-code",    0,            "set fault code (required)", INT16_MAX);
-    
+
     psMetadata *argSets = psMetadataAlloc();
     psMetadata *modes = psMetadataAlloc();
@@ -312 +314 @@
     // convert '-inst' to 'camera'
     {
-        psString str = NULL; 
+        psString str = NULL;
         bool status = false;
         if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) {