[GRASS-SVN] r53667 - in grass-addons/grass7/raster/r.modis: libmodis r.modis.download r.modis.import
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 2 12:10:25 PDT 2012
Author: martinl
Date: 2012-11-02 12:10:25 -0700 (Fri, 02 Nov 2012)
New Revision: 53667
Modified:
grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py
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:
attempt to fix r.modis install process (g.extension)
Modified: grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py 2012-11-02 18:10:00 UTC (rev 53666)
+++ grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py 2012-11-02 19:10:25 UTC (rev 53667)
@@ -278,7 +278,7 @@
datum = the datum to use, the valid values are: NAD27, NAD83, WGS66,
WGS76, WGS84, NODATUM
projpar = a list of projection parameters, for more info check the
- "Appendix C" of MODIS reprojection tool user’s manual
+ "Appendix C" of MODIS reprojection tool user's manual
https://lpdaac.usgs.gov/content/download/4831/22895/file/mrt41_usermanual_032811.pdf
"""
@@ -367,7 +367,7 @@
SIN ()Sinusoidal), UTM (Universal TransverseMercator)
utm = the UTM zone if projection system is UTM
projpar = a list of projection parameters, for more info check the
- "Appendix C" of MODIS reprojection tool user’s manual
+ "Appendix C" of MODIS reprojection tool user's manual
https://lpdaac.usgs.gov/content/download/4831/22895/file/mrt41_usermanual_032811.pdf
"""
# output name
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 2012-11-02 18:10:00 UTC (rev 53666)
+++ grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py 2012-11-02 19:10:25 UTC (rev 53667)
@@ -82,30 +82,33 @@
import grass.script as grass
# add the folder containing libraries to python path
-if os.path.isdir(os.path.join(os.getenv('GISBASE'), 'etc', 'r.modis',os.sep)):
+libmodis = None
+if os.path.isdir(os.path.join(os.getenv('GISBASE'), 'etc', 'r.modis')):
libmodis = os.path.join(os.getenv('GISBASE'), 'etc', 'r.modis')
-elif os.path.isdir(os.path.join(os.getenv('GRASS_ADDON_PATH'), 'etc', 'r.modis',os.sep)):
- libmodis = os.path.join(os.getenv('GRASS_ADDON_PATH'), 'etc', 'r.modis')
-else:
- print "ERROR: path to libraries not found"
- sys.exit()
+elif os.getenv('GRASS_ADDON_BASE') and \
+ os.path.isdir(os.path.join(os.getenv('GRASS_ADDON_BASE'), 'etc', 'r.modis')):
+ libmodis = os.path.join(os.getenv('GRASS_ADDON_BASE'), 'etc', 'r.modis')
+elif os.path.isdir(os.path.join('..', 'libmodis')):
+ libmodis = os.path.join('..', 'libmodis')
+if not libmodis:
+ sys.exit("ERROR: modis library not found")
+
# try to import pymodis (modis) and some class for r.modis.download
sys.path.append(libmodis)
try:
from rmodislib import product
from downmodis import downModis
-except ImportError:
- grass.fatal(_("modis library not imported"))
+except ImportError, e:
+ grass.fatal(e)
def check(home):
""" Check if a folder it is writable by the user that launch the process
"""
if os.access(home,os.W_OK):
- return 1
+ return True
else:
- grass.fatal(_("Folder to write downloaded files does not" \
- + " exist or is not writeable"))
- return 0
+ grass.fatal(_("Folder to write downloaded files does not "
+ "exist or is not writeable"))
def checkdate(options):
""" Function to check the data and return the correct value to download the
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 2012-11-02 18:10:00 UTC (rev 53666)
+++ grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py 2012-11-02 19:10:25 UTC (rev 53667)
@@ -91,30 +91,31 @@
import grass.script as grass
from datetime import date
-
-# add the folder containing libraries to python path
-if os.path.isdir(os.path.join(os.getenv('GISBASE'), 'etc', 'r.modis',os.sep)):
+libmodis = None
+if os.path.isdir(os.path.join(os.getenv('GISBASE'), 'etc', 'r.modis')):
libmodis = os.path.join(os.getenv('GISBASE'), 'etc', 'r.modis')
-elif os.path.isdir(os.path.join(os.getenv('GRASS_ADDON_PATH'), 'etc', 'r.modis',os.sep)):
- libmodis = os.path.join(os.getenv('GRASS_ADDON_PATH'), 'etc', 'r.modis')
-else:
- print "ERROR: path to libraries not found"
- sys.exit()
+elif os.getenv('GRASS_ADDON_BASE') and \
+ os.path.isdir(os.path.join(os.getenv('GRASS_ADDON_BASE'), 'etc', 'r.modis')):
+ libmodis = os.path.join(os.getenv('GRASS_ADDON_BASE'), 'etc', 'r.modis')
+elif os.path.isdir(os.path.join('..', 'libmodis')):
+ libmodis = os.path.join('..', 'libmodis')
+if not libmodis:
+ sys.exit("ERROR: modis library not found")
sys.path.append(libmodis)
# try to import pymodis (modis) and some classes for r.modis.download
try:
from rmodislib import resampling, product, get_proj, projection
-except ImportError:
- grass.fatal(_("rmodislib library not imported"))
+except ImportError, e:
+ grass.fatal(e)
try:
from convertmodis import convertModis, createMosaic
-except ImportError:
- grass.fatal(_("convertmodis library not imported"))
+except ImportError, e:
+ grass.fatal(e)
try:
from parsemodis import parseModis
-except ImportError:
- grass.fatal(_("parsemodis library not imported"))
+except ImportError, e:
+ grass.fatal(e)
def list_files(opt, mosaik = False):
"""If used in function single(): Return a list of HDF files from the file list
More information about the grass-commit
mailing list