From c9a6aad5c35c762a365e59959b7bd90bbc148ce3 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 17 Jun 2011 16:58:50 +0000 Subject: [PATCH] minor fix by request --- lib/request/comparison.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/request/comparison.py b/lib/request/comparison.py index 22d300c2b..14e9f7ddf 100644 --- a/lib/request/comparison.py +++ b/lib/request/comparison.py @@ -82,12 +82,24 @@ def comparison(page, getRatioValue=False, pageLength=None): elif isinstance(seqMatcher.a, unicode) and isinstance(page, str): seqMatcher.a = seqMatcher.a.encode(kb.pageEncoding or DEFAULT_PAGE_ENCODING, 'ignore') + seq1, seq2 = None, None + if conf.titles: - seqMatcher.set_seq1(extractRegexResult(HTML_TITLE_REGEX, seqMatcher.a)) - seqMatcher.set_seq2(extractRegexResult(HTML_TITLE_REGEX, page)) + seq1 = extractRegexResult(HTML_TITLE_REGEX, seqMatcher.a) + seq2 = extractRegexResult(HTML_TITLE_REGEX, page) else: - seqMatcher.set_seq1(getFilteredPageContent(seqMatcher.a, True) if conf.textOnly else seqMatcher.a) - seqMatcher.set_seq2(getFilteredPageContent(page, True) if conf.textOnly else page) + seq1 = getFilteredPageContent(seqMatcher.a, True) if conf.textOnly else seqMatcher.a + seq2 = getFilteredPageContent(page, True) if conf.textOnly else page + + if seq1: + seqMatcher.set_seq1(seq1) + else: + seqMatcher.a = seq1 + + if seq2: + seqMatcher.set_seq2(seq2) + else: + seqMatcher.b = seq2 if seqMatcher.a is None or seqMatcher.b is None: ratio = None