[kupu-checkins] r33447 - in kupu/trunk/kupu/plone: . kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Thu Oct 19 12:07:54 2006
New Revision: 33447

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt
Log:
Link checker needs to be language agnostic. It was flagging links to other language pages as broken.

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Thu Oct 19 12:07:54 2006
@@ -250,6 +250,7 @@
             query['portal_type'] = self.portal_type
         if self.paths:
             query['path'] = self.paths
+        query['Language'] = 'all'
         return query
 
     def getInfo(self, saveState=True):
@@ -418,7 +419,7 @@
         url = self.portal_base + url[len(self.portal_base_url):]
         if isinstance(url, unicode):
             url = url.encode('utf8') # ExtendedPathIndex can't cope with unicode paths
-        brains = self.portal_catalog.searchResults(path=url)
+        brains = self.portal_catalog.searchResults(path=url, Language='all')
         if len(brains) != 1:
             # Happens on Plone 2.0 :(
             for b in brains:

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt	Thu Oct 19 12:07:54 2006
@@ -138,7 +138,8 @@
             <div id="kupu-output" kj:mode="append" tal:condition="python:m['dryrun'] or not m['commit_changes']">
               <div tal:condition="m/found">
                 Search found <span tal:replace="m/found" />
-                <span tal:content="m/typename" /> objects.</div>
+                <span tal:content="m/typename" /> objects from <span
+                tal:content="m/total" /> searched.</div>
               <div tal:condition="not:m/found">Sorry, nothing was found</div>
             </div>
             <div id="kupu-message" kj:mode="replace">