[GRASS-SVN] r49887 - grass/trunk/raster/r.li/r.li.daemon

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-12-24 01:32:33 -0800 (Sat, 24 Dec 2011)
New Revision: 49887

Modified:
   grass/trunk/raster/r.li/r.li.daemon/daemon.c
Log:
r.li.daemon: do not silently remove the first area

Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c	2011-12-23 15:30:40 UTC (rev 49886)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c	2011-12-24 09:32:33 UTC (rev 49887)
@@ -128,38 +128,36 @@
     /*#######################################################
        ------------------analysis loop----------------------
        ####################################################### */
-    /*first job scheduling */
-    if (next_Area(parsed, l, g, &m) != 0)
 
-	/*body */
-	while (next_Area(parsed, l, g, &m) != 0) {
-	    worker_process(&doneJob, &m);
+    /*body */
+    while (next_Area(parsed, l, g, &m) != 0) {
+	worker_process(&doneJob, &m);
 
-	    /*perc++; */
-	    /*G_percent (perc, WORKERS, 1); */
-	    if (doneJob.type == DONE) {
-		double result;
+	/*perc++; */
+	/*G_percent (perc, WORKERS, 1); */
+	if (doneJob.type == DONE) {
+	    double result;
 
-		result = doneJob.f.f_d.res;
-		/*output */
-		if (parsed != MVWIN) {
-		    print_Output(res, doneJob);
-		}
-		else {
-		    /*raster output */
-		    raster_Output(random_access, doneJob.f.f_d.aid, g,
-				  doneJob.f.f_d.res);
-		}
+	    result = doneJob.f.f_d.res;
+	    /*output */
+	    if (parsed != MVWIN) {
+		print_Output(res, doneJob);
 	    }
 	    else {
-		if (parsed != MVWIN) {
-		    error_Output(res, doneJob);
-		}
-		else {
-		    /*printf("todo ");fflush(stdout); *//* TODO scrivere su raster NULL ??? */
-		}
+		/*raster output */
+		raster_Output(random_access, doneJob.f.f_d.aid, g,
+			      doneJob.f.f_d.res);
 	    }
 	}
+	else {
+	    if (parsed != MVWIN) {
+		error_Output(res, doneJob);
+	    }
+	    else {
+		/*printf("todo ");fflush(stdout); *//* TODO scrivere su raster NULL ??? */
+	    }
+	}
+    }
 
     worker_end();