schain Commit - r332:395575e10cc2 · Jicamarca Repository

Adicion de informacion de la fecha y hora en la busqueda de archivos

Miguel Valdez -

r332:395575e10cc2

parent child

Context file:

r332:395575e10cc2

Collapse all files

schainpy/model/jrodataIO.py +24 -21

                  sts = basicHeaderObj.read(fp)
                  fp.close()
+                 thisDatetime = basicHeaderObj.datatime
                  thisTime = basicHeaderObj.datatime.time()
                  if not(sts):
                      print "Skipping the file %s because it has not a valid header" %(filename)
-                     return 0
+                     return None
                  if not ((startTime <= thisTime) and (endTime > thisTime)):
-                     return 0
+                     return None
-                 return thisTime
+                 return thisDatetime
              def getlastFileFromPath(path, ext):
                  """
                  __isFirstTimeOnline = 1
+                 __printInfo = True
                  def __init__(self):
                      """
                                          walk=True):
                      pathList = []
-                     dateList = []
                      if not walk:
                          pathList.append(path)
                      else:
                          dirList = []
                          for thisPath in os.listdir(path):
                                  continue
                              pathList.append(os.path.join(path,match[0],expLabel))
-                             dateList.append(thisDate)
                              thisDate += datetime.timedelta(1)
                      for i in range(len(pathList)):
                          thisPath = pathList[i]
-                         thisDate = dateList[i]
                          fileList = glob.glob1(thisPath, "*%s" %ext)
                          fileList.sort()
                          for file in fileList:
                              filename = os.path.join(thisPath,file)
-                             thisTime = isFileinThisTime(filename, startTime, endTime)
+                             thisDatetime = isFileinThisTime(filename, startTime, endTime)
-                             if thisTime == 0:
+                             if not(thisDatetime):
                                  continue
                              filenameList.append(filename)
-                             datetimeList.append(datetime.datetime.combine(thisDate,thisTime))
+                             datetimeList.append(thisDatetime)
                      if not(filenameList):
                          print "Any file was found for the time range %s - %s" %(startTime, endTime)
                      """
                      dirList = []
-                     if walk:
+                     if not walk:
+                         fullpath = path
+                     else:
                          #Filtra solo los directorios
                          for thisPath in os.listdir(path):
                              if not os.path.isdir(os.path.join(path,thisPath)):
                          doypath = dirList[-1]
                          fullpath = os.path.join(path, doypath, expLabel)
-                     else:
-                         fullpath = path
                      print "%s folder was found: " %(fullpath )
                      set  = int( filename[8:11] )
                      return fullpath, filename, year, doy, set
                  def __setNextFileOffline(self):
                  def printInfo(self):
-                     print self.basicHeaderObj.printInfo()
-                     print self.systemHeaderObj.printInfo()
-                     print self.radarControllerHeaderObj.printInfo()
-                     print self.processingHeaderObj.printInfo()
+                     if self.__printInfo == False:
+                         return
+                     self.basicHeaderObj.printInfo()
+                     self.systemHeaderObj.printInfo()
+                     self.radarControllerHeaderObj.printInfo()
+                     self.processingHeaderObj.printInfo()
+                     self.__printInfo = False
                  def run(self, **kwargs):

schainpy/model/jroheaderIO.py +4 -1

                  def printInfo(self):
+                     print "#"*100
+                     print self.__class__.__name__.upper()
+                     print "#"*100
                      for key in self.__dict__.keys():
                          print "%s = %s" %(key, self.__dict__[key])
              class BasicHeader(Header):
                  size = None

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages