Changeset 25407 for branches/eam_branches/20090715/psModules/src/concepts/pmConceptsStandard.c

Timestamp:

Sep 15, 2009, 4:03:13 PM (17 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20090715/psModules/src/concepts/pmConceptsStandard.c (modified) (2 diffs)

branches/eam_branches/20090715/psModules/src/concepts/pmConceptsStandard.c

@@ -429 +429 @@
         }
 
-        psString ra = psMetadataLookupStr(&mdok, formats, "FPA.RA"); // Format for RA
-        psString dec = psMetadataLookupStr(&mdok, formats, "FPA.DEC"); // Format for Dec
-        if (ra && strcasecmp(ra, "HOURS") == 0 && dec && strcasecmp(dec, "DEGREES") == 0) {
-            sexagesimal = true;
+        if (strcmp(concept->name, "FPA.RA") == 0 || strcmp(concept->name, "FPA.DEC") == 0) {
+            psString ra = psMetadataLookupStr(&mdok, formats, "FPA.RA"); // Format for RA
+            psString dec = psMetadataLookupStr(&mdok, formats, "FPA.DEC"); // Format for Dec
+            if (ra && strcasecmp(ra, "HOURS") == 0 && dec && strcasecmp(dec, "DEGREES") == 0) {
+                sexagesimal = true;
+            }
         }
     } else {
@@ -450 +452 @@
         small = 3600.0 * coords;
         small = (float)((int)(small * 1000.0)) / 1000.0;
-        if (negative) {
-            big *= -1;
-        }
         psString coordString = NULL;        // String with the coordinates in sexagesimal format
-        psStringAppend(&coordString, "%d:%02d:%06.3f", big, medium, small);
+        psStringAppend(&coordString, "%s%02d:%02d:%06.3f",
+                       negative ? "-" : (strcmp(concept->name, "FPA.DEC") == 0 ? "+" : ""),
+                       big, medium, small);
         coordItem = psMetadataItemAllocStr(concept->name, concept->comment, coordString);
         psFree(coordString);