[Zope3-checkins] CVS: Zope3/src/zope/app/browser/index/text - configure.zcml:1.6.24.1 control.py:1.11.12.2

Albertas Agejevas alga@codeworks.lt
Mon, 23 Jun 2003 10:21:14 -0400


Update of /cvs-repository/Zope3/src/zope/app/browser/index/text
In directory cvs.zope.org:/tmp/cvs-serv16963/src/zope/app/browser/index/text

Modified Files:
      Tag: cw-mail-branch
	configure.zcml control.py 
Log Message:
One more sync with HEAD.

=== Zope3/src/zope/app/browser/index/text/configure.zcml 1.6 => 1.6.24.1 ===
--- Zope3/src/zope/app/browser/index/text/configure.zcml:1.6	Thu Feb 20 20:40:54 2003
+++ Zope3/src/zope/app/browser/index/text/configure.zcml	Mon Jun 23 10:19:43 2003
@@ -12,8 +12,8 @@
     />
 
   <browser:page
-    for="zope.textindex.textindexinterfaces.IStatistics"
-    name="index.html" 
+    for="zope.app.interfaces.index.text.IUITextIndex"
+    name="index.html"
     menu="zmi_views"
     title="Control"
     permission="zope.ManageServices"


=== Zope3/src/zope/app/browser/index/text/control.py 1.11.12.1 => 1.11.12.2 ===
--- Zope3/src/zope/app/browser/index/text/control.py:1.11.12.1	Sun Jun 22 10:22:40 2003
+++ Zope3/src/zope/app/browser/index/text/control.py	Mon Jun 23 10:19:43 2003
@@ -57,6 +57,9 @@
             start = int(self.request.get('start', self.default_start))
         count = int(self.request.get('count', self.default_count))
         results, total = self.context.query(queryText, start, count)
+        # XXX Two things:
+        #     1. query can raise an exception (QueryError or ParseError)
+        #     2. query is not in the IUITextIndex interface
         nresults = len(results)
         first = start + 1
         last = first + len(results) - 1