Changeset 11687 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Feb 7, 2007, 1:58:17 PM (19 years ago)

Author:

jhoblitt

Message:

update psAbort() API

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (9 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -768 +768 @@
     // a camera config is needed (as source of file rule)
     if (config->cameraName == NULL) {
-        psAbort ("pmFPAfileDefine", "camera defined but not cameraName!");
+        psAbort("camera defined but not cameraName!");
     }
 
@@ -807 +807 @@
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PPIMAGE");
     if (!status)
-        psAbort ("psModules", "PPIMAGE recipe not found");
+        psAbort("PPIMAGE recipe not found");
     psMetadata *detConstraints = psMetadataLookupPtr (&status, recipe, "DETREND.CONSTRAINTS");
     if (!status)
-        psAbort ("psModules", "DETREND.CONSTRAINTS not found");
+        psAbort("DETREND.CONSTRAINTS not found");
     // XXX allow this and just skip?
 
@@ -816 +816 @@
     psMetadata *constraints = psMetadataLookupPtr (&status, detConstraints, typeName);
     if (!status) {
-        psAbort ("psModules", "DETREND.CONSTRAINTS for type %s not found", typeName);
+        psAbort("DETREND.CONSTRAINTS for type %s not found", typeName);
     }
     psFree(typeName);
@@ -825 +825 @@
     while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
         if (item->type != PS_DATA_STRING) {
-            psAbort ("psModules", "invalid type for DETREND.CONSTRAINT element");
+            psAbort("invalid type for DETREND.CONSTRAINT element");
         }
         char *option  = item->name;     // item->name must correspond to a valid detselect option
@@ -833 +833 @@
             options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "failed to find filter (concept %s)", concept);
+                psAbort("failed to find filter (concept %s)", concept);
 
         }
@@ -839 +839 @@
             options->exptime = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "exptime not found (concept %s)", concept);
+                psAbort("exptime not found (concept %s)", concept);
         }
         if (!strcasecmp (option, "airmass")) {
             options->airmass = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "airmass not found (concept %s)", concept);
+                psAbort("airmass not found (concept %s)", concept);
         }
         # if (0)
@@ -850 +850 @@
                 options->dettemp = psMetadataLookupF32 (&status, input->concepts, concept);
                 if (!status)
-                    psAbort ("psModules", "dettemp not found (concept %s)", concept);
+                    psAbort("dettemp not found (concept %s)", concept);
             }
         if (!strcasecmp (option, "version")) {
@@ -856 +856 @@
             options->version = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "version not found (concept %s)", concept);
+                psAbort("version not found (concept %s)", concept);
         }
         if (!strcasecmp (option, "twilight")) {
@@ -863 +863 @@
             options->twilight = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "twilight not found (concept %s)", concept);
+                psAbort("twilight not found (concept %s)", concept);
         }
         # endif