Changeset 988 in products for qSEOptimizer/trunk/adapters.py

Timestamp:

Oct 1, 2007 2:52:49 PM (17 years ago)

Author:

crchemist

Message:

Merged with /qSEOptimizer/branches/additional-keywords branch

File:

• qSEOptimizer/trunk/adapters.py (copied) (copied from qSEOptimizer/branches/additional-keywords/adapters.py) (2 diffs)

qSEOptimizer/trunk/adapters.py

@@ +1 @@
+import re, commands
 from zope.interface import implements
 from Products.CMFCore.utils import getToolByName
@@ -13 +14 @@
         portal_props = getToolByName(self.context, 'portal_properties')
         seo_props = getToolByName(portal_props, 'seo_properties')
-        original = set(self.context.qSEO_Keywords())
-        additional = set(seo_props.additional_keywords)
-        text = set(self.context.SearchableText().split())
-        keywords = list(additional.intersection(text).union(original))
+
+        # now set type is not using because of it unordered behaviour
+        #original = set(self.context.qSEO_Keywords())
+        #additional = set(seo_props.additional_keywords)
+        #text = set(self.context.SearchableText().split())
+        #keywords = list(additional.intersection(text).union(original))
+
+        keywords = list(self.context.qSEO_Keywords())
+        lower_keywords = map(lambda x: x.lower(), keywords)
+        additional = seo_props.additional_keywords
+
+        is_test = self.context.REQUEST.get('qseo_without_additional_keywords', None)
+
+        if additional and is_test is None:
+            # extract words from url page using lynx browser
+            text = commands.getoutput('lynx --dump --nolist %s?qseo_without_additional_keywords=1' % self.context.absolute_url()).lower()
+            if text and text != 'sh: lynx: command not found':
+                for keyword in additional:
+                    if keyword.lower() not in lower_keywords and re.compile(r'\b%s\b' % keyword, re.I).search(text):
+                        keywords.append(keyword)
+
         return ', '.join(keywords)