Index: trunk/psModules/src/concepts/pmConceptsWrite.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 12397)
+++ trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 12564)
@@ -57,5 +57,5 @@
         while ((cItem = psListGetAndIncrement(cIter))) {
             if (cItem->type != PS_DATA_STRING) {
-                psLogMsg(__func__, PS_LOG_WARN, "psMetadataItem from list is of type %x instead of "
+                psWarning("psMetadataItem from list is of type %x instead of "
                          "%x (PS_DATA_STRING) --- can't interpret.\n", cItem->type, PS_DATA_STRING);
                 psFree(cIter);
@@ -178,5 +178,5 @@
         }
     default:
-        psLogMsg(__func__, PS_LOG_WARN, "Type of %s is not suitable for a FITS header --- not added.\n",
+        psWarning("Type of %s is not suitable for a FITS header --- not added.\n",
                  item->name);
         return false;
@@ -261,5 +261,5 @@
                 if (strcasecmp(source, "HEADER") == 0) {
                     if (cameraItem->type != PS_DATA_STRING) {
-                        psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by header, but is not "
+                        psWarning("Concept %s is specified by header, but is not "
                                  "of type STR --- ignored.\n", conceptItem->name);
                         continue;
@@ -286,10 +286,10 @@
                     psTrace("psModules.concepts", 8, "Checking %s against camera format.\n", name);
                     if (! compareConcepts(formatted, cameraItem)) {
-                        psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
+                        psWarning("Concept %s is specified by value in the camera "
                                  "format, but the values don't match.\n", name);
                     }
                     psFree(formatted);
                 } else {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept source %s isn't HEADER or VALUE --- can't "
+                    psWarning("Concept source %s isn't HEADER or VALUE --- can't "
                              "write\n", nameSource);
                 }
@@ -303,5 +303,5 @@
 
                 if (! compareConcepts(formatted, cameraItem)) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
+                    psWarning("Concept %s is specified by value in the camera "
                              "format, but the values don't match.\n", name);
                 }
@@ -347,5 +347,5 @@
                 psString dependKey = psMetadataLookupStr(&mdok, defaults, dependName); // The keyword
                 if (!mdok || !dependKey || strlen(dependKey) == 0) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Can't find %s in the DEFAULTS for %s --- ignored.\n",
+                    psWarning("Can't find %s in the DEFAULTS for %s --- ignored.\n",
                              dependName, name);
                     psFree(dependName);
@@ -354,5 +354,5 @@
                 psString dependValue = psMetadataLookupStr(&mdok, concepts, dependKey); // The value
                 if (!mdok || !dependValue || strlen(dependValue) == 0) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept %s specified by %s isn't of type STR -- "
+                    psWarning("Concept %s specified by %s isn't of type STR -- "
                              "ignored.\n", dependKey, dependName);
                     psFree(dependName);
@@ -360,11 +360,11 @@
                 }
                 // Get the actual item of interest, and correct the name to match the concept name
-		defaultItem = psMetadataLookup(defaultItem->data.md, dependValue);
-		if (!defaultItem) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept dependency name %s is not found "
-			     "in concept table for %s -- ignored.\n", dependValue, dependName);
+                defaultItem = psMetadataLookup(defaultItem->data.md, dependValue);
+                if (!defaultItem) {
+                    psWarning("Concept dependency name %s is not found "
+                             "in concept table for %s -- ignored.\n", dependValue, dependName);
                     psFree(dependName);
                     continue;
-		}
+                }
                 defaultItem = psMetadataItemCopy(defaultItem);
                 psFree(dependName);
@@ -381,5 +381,5 @@
             }
             if (! compareConcepts(formatted, defaultItem)) {
-                psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by the DEFAULTS in the camera "
+                psWarning("Concept %s is specified by the DEFAULTS in the camera "
                          "format, but the values don't match.\n", name);
             }
@@ -418,5 +418,5 @@
         if (headerItem) {
             if (headerItem->type != PS_DATA_STRING) {
-                psLogMsg(__func__, PS_LOG_WARN, "TRANSLATION keyword for concept %s isn't of type STR ---"
+                psWarning("TRANSLATION keyword for concept %s isn't of type STR ---"
                          " ignored.", name);
                 continue;
@@ -471,5 +471,5 @@
         if (dbItem) {
             if (dbItem->type != PS_DATA_METADATA) {
-                psLogMsg(__func__, PS_LOG_WARN, "DATABASE keyword for concept %s isn't of type METADATA "
+                psWarning("DATABASE keyword for concept %s isn't of type METADATA "
                          "--- ignored.\n", name);
                 continue;
@@ -508,5 +508,5 @@
                         char *dependName = psListGetAndIncrement(valuesIter); // Name for the value
                         if (!strlen(column) || !strlen(name)) {
-                            psLogMsg(__func__, PS_LOG_WARN, "One of the columns or value names for %s is "
+                            psWarning("One of the columns or value names for %s is "
                                      " empty --- ignored.\n", name);
                         } else {
@@ -543,10 +543,10 @@
                     // Note that we use limit=2 in order to test if there are multiple rows returned
                     if (! dbResult || dbResult->n == 0) {
-                        psLogMsg(__func__, PS_LOG_WARN, "Unable to find any rows in DB for %s --- "
+                        psWarning("Unable to find any rows in DB for %s --- "
                                  "ignored\n", name);
                         return false;
                     } else {
                         if (dbResult->n > 1) {
-                            psLogMsg(__func__, PS_LOG_WARN, "Multiple rows returned in DB lookup for %s "
+                            psWarning("Multiple rows returned in DB lookup for %s "
                                      "--- ignored.\n", name);
                         }