[GRASS-SVN] r48661 - grass/trunk/raster/r.series

[svn_grass at osgeo.org]

Author: huhabla
Date: 2011-10-06 04:43:15 -0700 (Thu, 06 Oct 2011)
New Revision: 48661

Modified:
   grass/trunk/raster/r.series/main.c
   grass/trunk/raster/r.series/test.r.series.sh
Log:
Corrected verbose message position, removed output generation from
tests.


Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c	2011-10-06 11:40:48 UTC (rev 48660)
+++ grass/trunk/raster/r.series/main.c	2011-10-06 11:43:15 UTC (rev 48661)
@@ -223,10 +223,10 @@
 	    p = &inputs[num_inputs++];
 
 	    p->name = G_store(name);
+	    G_verbose_message(_("Reading raster map <%s>..."), p->name);
 	    p->buf = Rast_allocate_d_buf();
 	    if (!flag.lazy->answer)
 		p->fd = Rast_open_old(p->name, "");
-	    G_verbose_message(_("Reading raster map <%s>..."), p->name);
 	}
 
 	if (num_inputs < 1)
@@ -248,10 +248,10 @@
 	    struct input *p = &inputs[i];
 
 	    p->name = parm.input->answers[i];
+	    G_verbose_message(_("Reading raster map <%s>..."), p->name);
 	    p->buf = Rast_allocate_d_buf();
 	    if (!flag.lazy->answer)
 		p->fd = Rast_open_old(p->name, "");
-	    G_verbose_message(_("Reading raster map <%s>..."), p->name);
     	}
     }
 

Modified: grass/trunk/raster/r.series/test.r.series.sh
===================================================================
--- grass/trunk/raster/r.series/test.r.series.sh	2011-10-06 11:40:48 UTC (rev 48660)
+++ grass/trunk/raster/r.series/test.r.series.sh	2011-10-06 11:43:15 UTC (rev 48661)
@@ -39,12 +39,12 @@
 r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_range method=range
 r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_sum method=sum
 
-r.out.ascii --o input=test_1_prec_mean output=test_1_prec_mean.ref dp=3
-r.out.ascii --o input=test_1_prec_max output=test_1_prec_max.ref dp=3
-r.out.ascii --o input=test_1_prec_min output=test_1_prec_min.ref dp=3
-r.out.ascii --o input=test_1_prec_count output=test_1_prec_count.ref dp=3
-r.out.ascii --o input=test_1_prec_range output=test_1_prec_range.ref dp=3
-r.out.ascii --o input=test_1_prec_sum output=test_1_prec_sum.ref dp=3
+#r.out.ascii --o input=test_1_prec_mean output=test_1_prec_mean.ref dp=3
+#r.out.ascii --o input=test_1_prec_max output=test_1_prec_max.ref dp=3
+#r.out.ascii --o input=test_1_prec_min output=test_1_prec_min.ref dp=3
+#r.out.ascii --o input=test_1_prec_count output=test_1_prec_count.ref dp=3
+#r.out.ascii --o input=test_1_prec_range output=test_1_prec_range.ref dp=3
+#r.out.ascii --o input=test_1_prec_sum output=test_1_prec_sum.ref dp=3
 
 # The second @test with file input and @precision=3
 r.series -z --o --v file=$TMP_FILE output=test_2_prec_mean method=average
@@ -54,9 +54,9 @@
 r.series -z --o --v file=$TMP_FILE output=test_2_prec_range method=range
 r.series    --o --v file=$TMP_FILE output=test_2_prec_sum method=sum
 
-r.out.ascii --o input=test_2_prec_mean output=test_2_prec_mean.ref dp=3
-r.out.ascii --o input=test_2_prec_max output=test_2_prec_max.ref dp=3
-r.out.ascii --o input=test_2_prec_min output=test_2_prec_min.ref dp=3
-r.out.ascii --o input=test_2_prec_count output=test_2_prec_count.ref dp=3
-r.out.ascii --o input=test_2_prec_range output=test_2_prec_range.ref dp=3
-r.out.ascii --o input=test_2_prec_sum output=test_2_prec_sum.ref dp=3
+#r.out.ascii --o input=test_2_prec_mean output=test_2_prec_mean.ref dp=3
+#r.out.ascii --o input=test_2_prec_max output=test_2_prec_max.ref dp=3
+#r.out.ascii --o input=test_2_prec_min output=test_2_prec_min.ref dp=3
+#r.out.ascii --o input=test_2_prec_count output=test_2_prec_count.ref dp=3
+#r.out.ascii --o input=test_2_prec_range output=test_2_prec_range.ref dp=3
+#r.out.ascii --o input=test_2_prec_sum output=test_2_prec_sum.ref dp=3