[GRASS-dev] error in compiling latest i.landsat.toar

[Nikos Alexandris]

On Tuesday 12 of February 2013 11:57:43 Martin Landa wrote:

Martin,

true I had something local.  However, yesterday I selected "theirs-conflict".  
Wouldn't that overwrite any local mods?

Thanks, N

ps- below the diff

> svn diff

nik at eScientific:/geo/osgeo/src/grass_trunk/imagery/i.landsat.toar$ svn diff
Index: landsat_met.c
===================================================================
--- landsat_met.c       (revision 55008)
+++ landsat_met.c       (working copy)
@@ -80,6 +80,7 @@
     
     i = 0; while( value[i] && (value[i] < '0' || value[i] > '9') ) i++;
     lsat->number = atoi(value + i);
+     */
 
     get_mtldata(mtldata, "SENSOR_ID", value);
     if( value[0] == '\0' )
@@ -98,6 +99,11 @@
         }
     }
     chrncpy(lsat->date, value, 10);
+    if( value[0] == '\0' )
+    {
+        get_mtldata(mtldata, "DATE_ACQUIRED", value);
+        chrncpy(lsat->date, value, 10);
+    }
 
     get_mtldata(mtldata, "FILE_DATE", value);
     if( value[0] == '\0' )
@@ -109,6 +115,13 @@
         }
     }
     chrncpy(lsat->creation, value, 10);
+    /*
+    if( value[0] == '\0' )
+    {
+        get_mtldata(mtldata, "FILE_DATE", value);
+        chrncpy(lsat->date, value, 10);
+    }
+    */
 
     get_mtldata(mtldata, "SUN_AZIMUTH", value);
     lsat->sunza = atof(value);
@@ -177,6 +190,7 @@
             }
             value[j] = '\0';
             G_debug(1, "ETM+ gain = [%s]", value);
+            */
             set_ETM(lsat, value);
             break;
         }