[GRASS-SVN] r43680 - grass-addons/imagery/i.landsat.toar

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-09-25 06:09:00 +0000 (Sat, 25 Sep 2010)
New Revision: 43680

Modified:
   grass-addons/imagery/i.landsat.toar/landsat_met.c
   grass-addons/imagery/i.landsat.toar/main.c
Log:
message standardization

Modified: grass-addons/imagery/i.landsat.toar/landsat_met.c
===================================================================
--- grass-addons/imagery/i.landsat.toar/landsat_met.c	2010-09-24 17:18:04 UTC (rev 43679)
+++ grass-addons/imagery/i.landsat.toar/landsat_met.c	2010-09-25 06:09:00 UTC (rev 43680)
@@ -54,7 +54,7 @@
 	{ 1969., 1840., 1551., 1044., 225.7, 0., 82.07, 1368. };
 
     if ((f = fopen(metfile, "r")) == NULL)
-	G_fatal_error(_(".met file [%s] not found"), metfile);
+	G_fatal_error(_("Metadata file <%s> not found"), metfile);
 
     fread(mettext, 1, ETM_MET_SIZE, f);
 
@@ -142,7 +142,7 @@
     /* char metdate[MAX_STR]; */
 
     if ((f = fopen(metfile, "r")) == NULL)
-	G_fatal_error(_(".met file [%s] not found"), metfile);
+	G_fatal_error(_("Metadata file <%s> not found"), metfile);
 
     fread(mettext, 1, TM5_MET_SIZE, f);
 
@@ -156,7 +156,7 @@
     }
 
     if (lsat->creation[0] == 0)
-	G_fatal_error(_("Product creation date not in .met file [%s]"),
+	G_fatal_error(_("Product creation date not in metadata file <%s>"),
 		      metfile);
 
     get_value_met(mettext, "SolarElevation", value);

Modified: grass-addons/imagery/i.landsat.toar/main.c
===================================================================
--- grass-addons/imagery/i.landsat.toar/main.c	2010-09-24 17:18:04 UTC (rev 43679)
+++ grass-addons/imagery/i.landsat.toar/main.c	2010-09-25 06:09:00 UTC (rev 43680)
@@ -269,7 +269,7 @@
 		G_message("Landsat-1 MSS");
 	    }
 	    else {
-		G_fatal_error(_("Unuknown satellite type"));
+		G_fatal_error(_("Unknown satellite type"));
 	    }
 	}
     }
@@ -310,15 +310,15 @@
 	    snprintf(band_in, 127, "%s.%d", name, lsat.band[i].code);
 	    mapset = G_find_cell2(band_in, "");
 	    if (mapset == NULL) {
-		G_warning(_("Raster file [%s] not found"), band_in);
+		G_warning(_("Raster map <%s> not found"), band_in);
 		continue;
 	    }
 	    if ((infd = G_open_cell_old(band_in, mapset)) < 0)
-		G_fatal_error(_("Cannot open cell file [%s]"), band_in);
+		G_fatal_error(_("Unable to open raster map <%s>"), band_in);
 	    if (G_get_cellhd(band_in, mapset, &cellhd) < 0)
-		G_fatal_error(_("Cannot read file header of [%s]"), band_in);
+		G_fatal_error(_("Unable to read header of raster map <%s>"), band_in);
 	    if (G_set_window(&cellhd) < 0)
-		G_fatal_error(_("Unable to set region"));
+		G_fatal_error(_("Cannot reset current region"));
 
 	    in_data_type = G_raster_map_type(band_in, mapset);
 	    inrast = G_allocate_raster_buf(in_data_type);
@@ -446,27 +446,27 @@
 
 	mapset = G_find_cell2(band_in, "");
 	if (mapset == NULL) {
-	    G_warning(_("raster file [%s] not found"), band_in);
+	    G_warning(_("Raster map <%s> not found"), band_in);
 	    continue;
 	}
 
 	in_data_type = G_raster_map_type(band_in, mapset);
 	if ((infd = G_open_cell_old(band_in, mapset)) < 0)
-	    G_fatal_error(_("Cannot open cell file [%s]"), band_in);
+	    G_fatal_error(_("Unable to open raster map <%s>"), band_in);
 
 	if (G_get_cellhd(band_in, mapset, &cellhd) < 0)
-	    G_fatal_error(_("Cannot read file header of [%s]"), band_in);
+	    G_fatal_error(_("Unable to read header of raster map <%s>"), band_in);
 
 	/* set same size as original band raster */
 	if (G_set_window(&cellhd) < 0)
-	    G_fatal_error(_("Unable to set region"));
+	    G_fatal_error(_("Cannot reset current region"));
 
 	/* controlling, if we can write the raster */
 	if (G_legal_filename(band_out) < 0)
-	    G_fatal_error(_("[%s] is an illegal name"), band_out);
+	    G_fatal_error(_("<%s> is an illegal file name"), band_out);
 
 	if ((outfd = G_open_raster_new(band_out, DCELL_TYPE)) < 0)
-	    G_fatal_error(_("Could not open <%s>"), band_out);
+	    G_fatal_error(_("Unable to create raster map <%s>"), band_out);
 
 	/* Allocate input and output buffer */
 	inrast = G_allocate_raster_buf(in_data_type);
@@ -523,7 +523,7 @@
 		}
 	    }
 	    if (G_put_raster_row(outfd, outrast, DCELL_TYPE) < 0)
-		G_fatal_error(_("Cannot write to <%s>"), band_out);
+		G_fatal_error(_("Failed writing raster map <%s> row %d"), band_out, row);
 	}
 	ref_mode = 0.;
 	if (method > DOS && !lsat.band[i].thermal) {