@@ -124,6 +124,10 class JROData: | |||
|
124 | 124 | realtime = False |
|
125 | 125 | |
|
126 | 126 | beacon_heiIndexList = None |
|
127 | ||
|
128 | last_block = None | |
|
129 | ||
|
130 | blocknow = None | |
|
127 | 131 | |
|
128 | 132 | def __init__(self): |
|
129 | 133 |
@@ -985,6 +985,7 class JRODataReader(JRODataIO, ProcessingUnit): | |||
|
985 | 985 | self.set = set - 1 |
|
986 | 986 | self.path = path |
|
987 | 987 | self.foldercounter = foldercounter |
|
988 | last_set = None | |
|
988 | 989 | |
|
989 | 990 | else: |
|
990 | 991 | print "Searching files in offline mode ..." |
@@ -1004,7 +1005,10 class JRODataReader(JRODataIO, ProcessingUnit): | |||
|
1004 | 1005 | self.fileIndex = -1 |
|
1005 | 1006 | self.pathList = pathList |
|
1006 | 1007 | self.filenameList = filenameList |
|
1007 | ||
|
1008 | file_name = os.path.basename(filenameList[-1]) | |
|
1009 | basename, ext = os.path.splitext(file_name) | |
|
1010 | last_set = int(basename[-3:]) | |
|
1011 | ||
|
1008 | 1012 | self.online = online |
|
1009 | 1013 | self.delay = delay |
|
1010 | 1014 | ext = ext.lower() |
@@ -1021,7 +1025,8 class JRODataReader(JRODataIO, ProcessingUnit): | |||
|
1021 | 1025 | sys.exit(-1) |
|
1022 | 1026 | |
|
1023 | 1027 | # self.updateDataHeader() |
|
1024 | ||
|
1028 | if last_set != None: | |
|
1029 | self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock | |
|
1025 | 1030 | return self.dataOut |
|
1026 | 1031 | |
|
1027 | 1032 | def getBasicHeader(self): |
@@ -1070,7 +1075,7 class JRODataReader(JRODataIO, ProcessingUnit): | |||
|
1070 | 1075 | |
|
1071 | 1076 | if self.flagIsNewBlock: |
|
1072 | 1077 | print "Block No. %04d, Total blocks %04d -> %s" %(self.basicHeaderObj.dataBlock, self.nTotalBlocks, self.dataOut.datatime.ctime()) |
|
1073 | ||
|
1078 | self.dataOut.blocknow = self.basicHeaderObj.dataBlock | |
|
1074 | 1079 | def printInfo(self): |
|
1075 | 1080 | |
|
1076 | 1081 | if self.__printInfo == False: |
General Comments 0
You need to be logged in to leave comments.
Login now