Changeset 17052

Timestamp:

Mar 18, 2008, 4:08:40 PM (18 years ago)

Author:

Paul Price

Message:

Need strings.h for strcasecmp

Location:

trunk/pstamp/src

Files:

• ppstampMakeStamp.c (modified) (11 diffs)
• pstampparse.c (modified) (16 diffs)

trunk/pstamp/src/ppstampMakeStamp.c

@@ -2 +2 @@
 #include <config.h>
 #endif
+#include <strings.h>
 
 #include "ppstamp.h"
@@ -122 +123 @@
         lastY = image->row0 + image->numRows;
     }
-        
+
     int leftBlank = 0;
     int dstX  = 0;
@@ -173 +174 @@
 // Build the postage stamp output file
 
-static bool makeStamp(pmConfig *config, ppstampOptions *options, pmFPAfile *input, 
+static bool makeStamp(pmConfig *config, ppstampOptions *options, pmFPAfile *input,
                 pmChip *inChip, pmFPAview *view)
 {
@@ -194 +195 @@
 
     //   psMetadataPrint(stderr, inChip->concepts, 0);
-    
+
     // These default to zero. would that be ok?
     psMetadataAddS32(target->concepts, PS_LIST_TAIL, "CELL.XBIN", PS_META_REPLACE, "Binning in x", 1);
@@ -236 +237 @@
         if (ppstampMegacamWorkaround) {
             // the coordinates of the mosaic are shifted 32 pixels from the chip
-            // TODO does this always apply? For example I doubt that applies to 
+            // TODO does this always apply? For example I doubt that applies to
             // skycells.
             extractRegion.x0 -= 32;
@@ -345 +346 @@
     options->roi.y0 = INFINITY;
     options->roi.y1 = -INFINITY;
-    
+
     pt->sky->rErr = 0;
     pt->sky->dErr = 0;
@@ -422 +423 @@
 
         if (regionContainsPoint(chipBounds, center->chip)) {
-            psLogMsg("ppstampMakeStamp", 2, "Found center (%f %f) on chip: %s\n", 
+            psLogMsg("ppstampMakeStamp", 2, "Found center (%f %f) on chip: %s\n",
                 center->chip->x, center->chip->y, chipName);
             onChip = true;
         }
     } else {
-        // center specified in pixels. 
+        // center specified in pixels.
         // If the user specified a name of a chip name wait until we get to that one.
         // If no chip name was specified, select this one (the first one that had data)
@@ -499 +500 @@
     pmChip *chip;
     while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
-        bool allDone = false;
+        bool allDone = false;
 
         if (!chip->process || !chip->file_exists) {
@@ -518 +519 @@
             break;
         case PPSTAMP_ON:
-        case PPSTAMP_PARTIALLY_ON:
+        case PPSTAMP_PARTIALLY_ON:
             returnval = makeStamp(config, options, input, chip, view);
             allDone = true;
@@ -532 +533 @@
         }
 
-        pmFPAfileIOChecks(config, view, PM_FPA_AFTER);
+        pmFPAfileIOChecks(config, view, PM_FPA_AFTER);
 
         if (allDone) {
@@ -538 +539 @@
             break;
         }
-    } 
+    }
     pmFPAfileIOChecks(config, view, PM_FPA_AFTER);
 

trunk/pstamp/src/pstampparse.c

@@ -5 +5 @@
 #include <psmodules.h>
 #include <string.h>
+#include <strings.h>
 #include "pstamp.h"
 #include "pstampROI.h"
@@ -135 +136 @@
         psError(PS_ERR_IO, false, "psFitsReadTable failed for %s", options->fileName);
         return false;
-    } 
+    }
 
     options->md = array->data[0];
@@ -213 +214 @@
     //         target                               key1
     //
-    // 
+    //
     // we return an array containing strins for the values
 
@@ -283 +284 @@
     }
     psU64 len = psArrayLength(array);
-    
+
     psString id = NULL;
     if (len > 0) {
@@ -322 +323 @@
         return NULL;
 
-    psArray *chip_files = runQuery(options, 
+    psArray *chip_files = runQuery(options,
                         "SELECT %s from chipProcessedImfile WHERE chip_id = %s AND class_id = '%s'",
                         "uri", chip_id, class_id, true, NULL);
@@ -343 +344 @@
     psString warp_id = warpIDForCam(options, cam_id);
 
-    psArray *warp_files = runQuery(options, 
+    psArray *warp_files = runQuery(options,
                         "SELECT %s from warpSkyfile WHERE warp_id = %s"
                         " AND uri IS NOT NULL and (fault = 0 or fault is NULL)",
@@ -384 +385 @@
 
     psU64 len = psArrayLength(stackIDs);
-    
+
     // loop over the stack's for this exposure and add the images
     for (int i = 0; i < len ; i++ ) {
@@ -424 +425 @@
 
     psU64 len = psArrayLength(diffIDs);
-    
+
     for (int i = 0; i < len ; i++ ) {
         psString diff_id = (psString) diffIDs->data[i];
@@ -474 +475 @@
             psString uri = (psString) uris->data[i];
             printf("uri: %s\n", uri ? (psString) uri : "NULL uri");
-        } 
+        }
 #endif
 
@@ -484 +485 @@
 {
     psArray *results;
-    
+
     results = runQuery(options, "SELECT %s from rawExp WHERE exp_name = '%s'",
                         "exp_id", exposure, NULL, false, NULL);
@@ -603 +604 @@
     psString cmd = NULL;
 
-    psStringAppend(&cmd, "pstamptool -addjob -req_id %ld -job_type %s -uri %s ", 
+    psStringAppend(&cmd, "pstamptool -addjob -req_id %ld -job_type %s -uri %s ",
         options->req_id, job_type, uri);
-    
+
     if (outputBase != NULL) {
         psStringAppend(&cmd, "-outputBase ");
-    
+
         if (options->outputDirectory) {
             psStringAppend(&cmd, "%s/", options->outputDirectory);
@@ -646 +647 @@
         for (int i = 0; i< numURIs; i++) {
             psString outputBase = NULL;
-            
+
             // append an integer to the user_tag to get a uniqueu outputBase
             psStringAppend(&outputBase, "%s_%d", user_tag, i);
@@ -677 +678 @@
     psString    img_type = psMetadataLookupStr(NULL, options->md, "IMG_TYPE");
 
-    if (! turnOffResultsFile(options)) { 
+    if (! turnOffResultsFile(options)) {
         fprintf(stderr, "failed to update resultsFile for request %" PRId64 "\n", options->req_id);
         return false;
@@ -700 +701 @@
 
     psString cmd = NULL;
-    psStringAppend(&cmd, "pstamptool -addjob -req_id %ld -job_type get_image -uri %s -outputBase %s", 
+    psStringAppend(&cmd, "pstamptool -addjob -req_id %ld -job_type get_image -uri %s -outputBase %s",
         options->req_id, fileName, options->outputDirectory);
-    
+
     int rstatus = system(cmd);
     if (rstatus) {
@@ -792 +793 @@
             // TODO: the ppstamp argument needs to change to class_id
             // perhaps allow chip as a synonym
-            psStringAppend(&commandArgs, " -chip %s", class_id); 
+            psStringAppend(&commandArgs, " -chip %s", class_id);
         }
         psString user_tag = psMetadataLookupStr(&status, options->md, "USER_TAG");
@@ -839 +840 @@
 
     // XXX: create a set of status codes to return so the
-    // scripts can distinguish between different errors. 
+    // scripts can distinguish between different errors.
     // For example:
     //      If we can't connect to the DB it's a configuration problem.