Changeset 12652

Timestamp:

Mar 28, 2007, 1:38:24 PM (19 years ago)

Author:

Paul Price

Message:

Fixing up errors.

File:

• trunk/psModules/src/concepts/pmConceptsAverage.c (modified) (1 diff)

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -65 +65 @@
         } else {
             if (timeSys != psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.TIMESYS in use: %d vs %d\n", timeSys,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS"));
+                psError(PS_ERR_BAD_PARAMATER_VALUE, true, "Differing CELL.TIMESYS in use: %d vs %d\n",
+                        timeSys, psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS"));
                 success = false;
             }
             if (readdir != psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.READDIR in use: %d vs %d\n", readdir,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR"));
+                psError(PS_ERR_BAD_PARAMATER_VALUE, true, "Differing CELL.READDIR in use: %d vs %d\n",
+                        readdir, psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR"));
                 success = false;
             }
             if (xBin != psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.XBIN in use: %d vs %d\n", xBin,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN"));
+                psError(PS_ERR_BAD_PARAMATER_VALUE, true, "Differing CELL.XBIN in use: %d vs %d\n",
+                        x Bin, psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN"));
                 success = false;
             }
             if (yBin != psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.YBIN in use: %d vs %d\n", yBin,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"));
+                psError(PS_ERR_BAD_PARAMATER_VALUE, true, "Differing CELL.YBIN in use: %d vs %d\n",
+                        yBin, psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"));
                 success = false;
             }
             if (x0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.X0")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.X0 in use: %d vs %d\n", x0,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.X0"));
+                psError(PS_ERR_BAD_PARAMATER_VALUE, true, "Differing CELL.X0 in use: %d vs %d\n",
+                        x0, psMetadataLookupS32(NULL, cell->concepts, "CELL.X0"));
                 success = false;
             }
             if (y0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.Y0 in use: %d vs %d\n", y0,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0"));
+                psError(PS_ERR_BAD_PARAMATER_VALUE, true, "Differing CELL.Y0 in use: %d vs %d\n",
+                        y0, psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0"));
                 success = false;
             }