[GRASS-SVN] r55826 - grass-addons/grass7/raster/r.modis/libmodis

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2013-04-16 00:36:07 -0700 (Tue, 16 Apr 2013)
New Revision: 55826

Modified:
   grass-addons/grass7/raster/r.modis/libmodis/convertmodis.py
   grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py
Log:
update pymodis library

Modified: grass-addons/grass7/raster/r.modis/libmodis/convertmodis.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/convertmodis.py	2013-04-16 07:28:54 UTC (rev 55825)
+++ grass-addons/grass7/raster/r.modis/libmodis/convertmodis.py	2013-04-16 07:36:07 UTC (rev 55826)
@@ -129,12 +129,13 @@
     from parsemodis import parseModisMulti
     listHDF = []
     for i in self.HDFfiles:
-      if i.find(self.basepath) == -1:
+      if i.find(self.basepath) == -1 and i.find('.hdf.xml') == -1:
         print "Attection maybe you have the not full path in the HDF file list"
         listHDF.append(os.path.join(self.basepath,i.strip()))
+        self.tmplistfiles.write("%s\n" % os.path.join(self.basepath,i.strip()))
       elif i.find('.hdf.xml') == -1:
         listHDF.append(i.strip())
-        self.tmplistfiles.write(os.path.join(self.fullpath,i))
+        self.tmplistfiles.write("%s\n" % os.path.join(self.fullpath,i.strip()))
     pmm = parseModisMulti(listHDF)
     pmm.writexml(self.outxml)
     self.tmplistfiles.close()

Modified: grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py	2013-04-16 07:28:54 UTC (rev 55825)
+++ grass-addons/grass7/raster/r.modis/libmodis/parsemodis.py	2013-04-16 07:36:07 UTC (rev 55826)
@@ -818,7 +818,7 @@
     # TODO ADD BrowseProduct
     output = open(outputname, 'w')
     output.write('<?xml version="1.0" encoding="UTF-8"?>')
-    output.write('<!DOCTYPE GranuleMetaDataFile SYSTEM "http://ecsinfo.gsfc."\
-    "nasa.gov/ECSInfo/ecsmetadata/dtds/DPL/ECS/ScienceGranuleMetadata.dtd">')
+    output.write('<!DOCTYPE GranuleMetaDataFile SYSTEM "http://ecsinfo.gsfc.' \
+    'nasa.gov/ECSInfo/ecsmetadata/dtds/DPL/ECS/ScienceGranuleMetadata.dtd">')
     output.write(self.ElementTree.tostring(granule))
     output.close()
\ No newline at end of file