[GRASS-SVN] r60665 - grass/trunk/vector/v.vol.rst

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-06-02 05:08:45 -0700 (Mon, 02 Jun 2014)
New Revision: 60665

Modified:
   grass/trunk/vector/v.vol.rst/main.c
   grass/trunk/vector/v.vol.rst/user1.c
Log:
v.vol.rst: more messages about maps which are actually created

Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c	2014-06-02 04:03:53 UTC (rev 60664)
+++ grass/trunk/vector/v.vol.rst/main.c	2014-06-02 12:08:45 UTC (rev 60665)
@@ -555,7 +555,7 @@
      */
     if (TESTOUT) {
 	if ((fd4 = fopen("testout", "w+")) == NULL)
-	    G_fatal_error("Unable To open testout");
+	    G_fatal_error("Unable to open testout");
     }
 
     Vect_set_open_level(1);
@@ -636,7 +636,8 @@
 		     (zero_array_cell, sizeof(FCELL), n_cols, Tmp_fd_cell)))
 		    clean_fatal_error(_("Not enough disk space - cannot write temp files"));
 	    }
-	}
+	} else
+	  G_warning("Unable to create cellout raster map without cellinp");
 	ertot = 0.;
         
 	out_cond1 = (outz != NULL) || (gradient != NULL) || (aspect1 != NULL)
@@ -821,6 +822,8 @@
 
 		    Rast_command_history(&hist);
 		    Rast_write_history(cellout, &hist);
+		    G_message(_("Raster map <%s> created"), cellout);
+
 		    fclose(Tmp_fd_cell);
 		    unlink(Tmp_file_cell);
 		}
@@ -859,6 +862,7 @@
 		db_close_database_shutdown_driver(driver);
 		Vect_build(&Map);
 		Vect_close(&Map);
+		G_message(_("Vector map <%s> created"), cvdev);
 	    }
 
 	    fprintf(stderr, "\n");

Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c	2014-06-02 04:03:53 UTC (rev 60664)
+++ grass/trunk/vector/v.vol.rst/user1.c	2014-06-02 12:08:45 UTC (rev 60665)
@@ -467,7 +467,8 @@
 	if (Rast3d_close(cf1) == 0) {
 	    sprintf(buff, "Error closing output file %s ", outz);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), outz);
     }
 
   /*** Write out the gradient results ***/
@@ -517,7 +518,8 @@
 	if (Rast3d_close(cf2) == 0) {
 	    sprintf(buff, "Error closing output file %s ", gradient);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), gradient);
     }
 
   /*** Write out aspect1 results ***/
@@ -567,7 +569,8 @@
 	if (Rast3d_close(cf3) == 0) {
 	    sprintf(buff, "Error closing output file %s ", aspect1);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), aspect1);
     }
 
   /*** Write out aspect2 results ***/
@@ -617,7 +620,8 @@
 	if (Rast3d_close(cf4) == 0) {
 	    sprintf(buff, "Error closing output file %s ", aspect2);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), aspect2);
     }
 
   /*** Write out ncurv results ***/
@@ -667,7 +671,8 @@
 	if (Rast3d_close(cf5) == 0) {
 	    sprintf(buff, "Error closing output file %s ", ncurv);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), ncurv);
     }
 
   /*** Write out gcurv results ***/
@@ -717,7 +722,8 @@
 	if (Rast3d_close(cf6) == 0) {
 	    sprintf(buff, "Error closing output file %s ", gcurv);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), gcurv);
     }
 
   /*** Write mcurv results ***/
@@ -767,7 +773,8 @@
 	if (Rast3d_close(cf7) == 0) {
 	    sprintf(buff, "Error closing output file %s ", mcurv);
 	    clean_fatal_error(buff);
-	}
+	} else
+            G_message(_("3D raster map <%s> created"), mcurv);
     }
 
     G_free(data);