[GRASS-SVN] r66579 - in grass-addons/grass7/raster/r.modis: r.modis.download r.modis.import

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2015-10-22 12:53:29 -0700 (Thu, 22 Oct 2015)
New Revision: 66579

Modified:
   grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py
   grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py
Log:
r.modis: fix bugs

Modified: grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2015-10-22 19:30:21 UTC (rev 66578)
+++ grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2015-10-22 19:53:29 UTC (rev 66579)
@@ -218,9 +218,10 @@
         prod = product(produ).returned()
         #start modis class
         modisOgg = downModis(url=prod['url'], user=user, password=passwd,
-              destinationFolder=fold, tiles=tiles, path=prod['folder'],
-              today=firstday, enddate=finalday, delta=delta, debug=debug_opt,
-              checkgdal=checkgdal)
+                             destinationFolder=fold, tiles=tiles, delta=delta,
+                             path=prod['folder'], product=prod['prod'],
+                             today=firstday, enddate=finalday, debug=debug_opt,
+                             checkgdal=checkgdal)
         # connect to ftp
         modisOgg.connect()
         if modisOgg.nconnection <= 20:

Modified: grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py	2015-10-22 19:30:21 UTC (rev 66578)
+++ grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py	2015-10-22 19:53:29 UTC (rev 66579)
@@ -137,8 +137,8 @@
                 else:
                     filelist[day] = [line.strip()]
     # create a list for each file
-    elif options['dns'] != '':
-        filelist = [options['dns']]
+    elif options['input'] != '':
+        filelist = [options['input']]
         basedir = os.path.split(filelist[0])[0]
     return filelist, basedir