@@ -2848,7 +2848,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
28482848 return False
28492849 formversions = re .search ('(.*?)(\\ d+)' , formstring ).groups ()
28502850 fcompresstype = ""
2851- outlist = {'fnumfiles' : fnumfiles , 'fformat' : formversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : formversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [formstring ] + inheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextradata' : fextrafieldslist , 'ffilelist' : []}
2851+ outlist = {'fnumfiles' : fnumfiles , 'ffilestart' : filestart , ' fformat' : formversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : formversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [formstring ] + inheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextradata' : fextrafieldslist , 'ffilelist' : []}
28522852 if (seekstart < 0 ) or (seekstart > fnumfiles ):
28532853 seekstart = 0
28542854 if (seekend == 0 ) or (seekend > fnumfiles ) or (seekend < seekstart ):
@@ -7263,7 +7263,7 @@ def CatFileToArray(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0,
72637263 fcompresstype = compresscheck
72647264 if (fcompresstype == formatspecs ['format_magic' ]):
72657265 fcompresstype = ""
7266- outlist = {'fnumfiles' : fnumfiles , 'fformat' : formversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : formversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [formstring ] + inheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextradata' : fextrafieldslist , 'ffilelist' : []}
7266+ outlist = {'fnumfiles' : fnumfiles , 'ffilestart' : filestart , ' fformat' : formversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : formversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [formstring ] + inheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextradata' : fextrafieldslist , 'ffilelist' : []}
72677267 if (seekstart < 0 ) or (seekstart > fnumfiles ):
72687268 seekstart = 0
72697269 if (seekend == 0 ) or (seekend > fnumfiles ) or (seekend < seekstart ):
0 commit comments