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

rclchm: use posixpath not path when dealing with internal paths

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-12-27 17:59:33 +01:00
parent 72aac60264
commit 636b935904
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/filters/rclchm
View File

@ -4,6 +4,7 @@ Needs at least python 2.2 for HTMLParser (chmlib needs 2.2 too)"""
import sys import sys
import os import os
import posixpath
import urlparse import urlparse
import rclexecm import rclexecm
@ -110,8 +111,8 @@ class ChmWalker(HTMLParser):
HTMLParser.__init__(self) HTMLParser.__init__(self)
self.chm = chm self.chm = chm
self.contents = contents self.contents = contents
self.path = os.path.normpath(path) self.path = posixpath.normpath(path)
self.dir = os.path.dirname(self.path) self.dir = posixpath.dirname(self.path)
contents.append(self.path) contents.append(self.path)
def handle_starttag(self, tag, attrs): def handle_starttag(self, tag, attrs):
@ -139,9 +140,9 @@ class ChmWalker(HTMLParser):
if path: if path:
#print "got path", path, "me", self.path, "dir", self.dir #print "got path", path, "me", self.path, "dir", self.dir
if path[0] == "/": if path[0] == "/":
npath = os.path.normpath(path) npath = posixpath.normpath(path)
else: else:
npath = os.path.normpath(os.path.join(self.dir, path)) npath = posixpath.normpath(posixpath.join(self.dir, path))
if not npath in self.contents: if not npath in self.contents:
#print("Going into [%s] paths [%s]\n" % #print("Going into [%s] paths [%s]\n" %
#(npath,str(self.contents))) #(npath,str(self.contents)))