Changeset 11450

Timestamp:

Jan 30, 2007, 2:39:07 PM (19 years ago)

Author:

Paul Price

Message:

Adding pmConfigCommand.[ch] in order to supplement a command line with arguments for database and trace. This is required for running detselect in pmDetrendDB.c

Location:

trunk/psModules/src

Files:

• camera/pmFPAfileIO.c (modified) (1 diff)
• config/Makefile.am (modified) (2 diffs)
• config/pmConfigCommand.c (added)
• config/pmConfigCommand.h (added)
• detrend/pmDetrendDB.c (modified) (5 diffs)
• detrend/pmDetrendDB.h (modified) (2 diffs)
• psmodules.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -233 +233 @@
 
         psFree (file->filename);
-        file->filename = pmDetrendFile (file->filextra, extra);
+        file->filename = pmDetrendFile(file->filextra, extra, config);
         if (file->filename == NULL) {
             psError(PS_ERR_IO, false, "failed to find a valid detrend image for detID %s : classID %s\n", file->filextra, extra);

trunk/psModules/src/config/Makefile.am

@@ -7 +7 @@
     pmConfigRecipes.c \
     pmConfigCamera.c \
+    pmConfigCommand.c \
     pmVersion.c \
     pmErrorCodes.c
@@ -14 +15 @@
     pmConfigRecipes.h \
     pmConfigCamera.h \
+    pmConfigCommand.h \
     pmVersion.h \
     pmErrorCodes.h

trunk/psModules/src/detrend/pmDetrendDB.c

@@ -7 +7 @@
 #include <pslib.h>
 #include "pmConfig.h"
+#include "pmConfigCommand.h"
 #include "pmFPA.h"
 #include "pmFPALevel.h"
@@ -101 +102 @@
     PS_ASSERT_PTR_NON_NULL(config->site, NULL);
 
-    bool mdok;                          // Status of MD lookup
-    const char *dbserver = psMetadataLookupStr(&mdok, config->site, "DBSERVER"); // Database server
-    if (!mdok || strlen(dbserver) == 0) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBSERVER in site configuration.\n");
-        return NULL;
-    }
-    const char *dbname = psMetadataLookupStr(&mdok, config->site, "DBNAME"); // Database name
-    if (!mdok || strlen(dbname) == 0) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBNAME in site configuration.\n");
-        return NULL;
-    }
-    const char *dbuser = psMetadataLookupStr(&mdok, config->site, "DBUSER"); // Database user
-    if (!mdok || strlen(dbuser) == 0) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBUSER in site configuration.\n");
-        return NULL;
-    }
-    const char *dbpassword = psMetadataLookupStr(&mdok, config->site, "DBPASSWORD"); // Database password
-    if (!mdok || strlen(dbpassword) == 0) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBPASSWORD in site configuration.\n");
-        return NULL;
-    }
-
     int status, exit_status;
-    char *line = NULL;
+    psString line = NULL;
     char *time = psTimeToISO (&options->time);
     char *type = pmDetrendTypeToString (options->type);
@@ -130 +109 @@
 
     pmDetrendSelectResults *results = pmDetrendSelectResultsAlloc();
-    psStringAppend (&line, "detselect -search -inst %s -det_type %s -time %s "
-                    "-dbserver %s -dbname %s -dbuser %s -dbpassword %s",
-                    options->camera, type, time, dbserver, dbname, dbuser, dbpassword);
+    psStringAppend(&line, "detselect -search -inst %s -det_type %s -time %s", options->camera, type, time);
 
     if (options->filter) {
-        psStringAppend (&line, " -filter %s", options->filter);
+        psStringAppend(&line, " -filter %s", options->filter);
     }
     if (options->exptime > -1.0) {
-        psStringAppend (&line, " -exptime %f", options->exptime);
+        psStringAppend(&line, " -exptime %f", options->exptime);
     }
     if (options->airmass > -1.0) {
-        psStringAppend (&line, " -airmass %f", options->airmass);
-    }
-
+        psStringAppend(&line, " -airmass %f", options->airmass);
+    }
+
+    pmConfigDatabaseCommand(&line, config);
+    pmConfigTraceCommand(&line);
     psTrace("psModules.detrend", 5, "running %s", line);
 
@@ -214 +193 @@
 // detselect -select -detID (detID) -classID (classID)
 // returns: (detID) (classID) (filename) DONE
-char *pmDetrendFile (const char *detID, const char *classID)
+char *pmDetrendFile (const char *detID, const char *classID, const pmConfig *config)
 {
     unsigned int nFail;
@@ -222 +201 @@
 
     bool status;
-    char *line = NULL;
+    psString line = NULL;
     psArray *array = NULL;
 
     // generate the detselect command
     psStringAppend (&line, "detselect -select %s -class_id %s", detID, classID);
+    pmConfigDatabaseCommand(&line, config);
+    pmConfigTraceCommand(&line);
     psTrace("psModules.detrend", 5, "running %s", line);
 

trunk/psModules/src/detrend/pmDetrendDB.h

@@ -9 +9 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-30 04:46:20 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-01-31 00:35:24 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -65 +65 @@
 pmDetrendSelectResults *pmDetrendSelectResultsAlloc();
 pmDetrendSelectResults *pmDetrendSelect (const pmDetrendSelectOptions *options, const pmConfig *config);
-char *pmDetrendFile (const char *detID, const char *classID);
+char *pmDetrendFile (const char *detID, const char *classID, const pmConfig *config);
 
 /// @}

trunk/psModules/src/psmodules.h

@@ -13 +13 @@
 #include <pmConfig.h>
 #include <pmConfigRecipes.h>
+#include <pmConfigCamera.h>
+#include <pmConfigCommand.h>
 #include <pmVersion.h>