tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pst: reset generator for new file

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-06-13 16:16:32 +02:00
parent bec40e9a31
commit 6c73a0d666
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/filters/rclpst.py
View File

@ -274,6 +274,7 @@ class PstExtractor(object):
print("RECFILTERROR HELPERNOTFOUND pffexport") print("RECFILTERROR HELPERNOTFOUND pffexport")
sys.exit(1); sys.exit(1);
self.filename = params["filename:"] self.filename = params["filename:"]
self.generator = None
self.em.rclog("openfile: sys.platform [%s] [%s]" % (sys.platform,self.filename)) self.em.rclog("openfile: sys.platform [%s] [%s]" % (sys.platform,self.filename))
return True return True
@ -297,20 +298,25 @@ class PstExtractor(object):
return(False, "", "", rclexecm.RclExecM.eofnow) return(False, "", "", rclexecm.RclExecM.eofnow)
return (True, doc, ipath, False) return (True, doc, ipath, False)
def getnext(self, params): def getnext(self, params):
self.em.rclog("getnext:") self.em.rclog("getnext:")
if not self.generator: if not self.generator:
self.em.rclog("starting generator")
if not self.startCmd(self.filename): if not self.startCmd(self.filename):
return False return False
reader = PFFReader(self.em.rclog, infile=self.filein) reader = PFFReader(self.em.rclog, infile=self.filein)
self.generator = reader.mainloop() self.generator = reader.mainloop()
try: try:
doc, ipath = next(self.generator) doc, ipath = next(self.generator)
self.em.setmimetype("message/rfc822") self.em.setmimetype("message/rfc822")
self.em.rclog("getnext: ipath %s\ndoc\n%s" % (ipath, doc)) #self.em.rclog("getnext: ipath %s\ndoc\n%s" % (ipath, doc))
except StopIteration: except StopIteration:
return(False, "", "", rclexecm.RclExecM.eofnow) self.em.rclog("getnext: end of iteration")
return (True, doc, ipath, False) return(True, "", "", rclexecm.RclExecM.eofnext)
return (True, doc, ipath, rclexecm.RclExecM.noteof)
if True: if True: