equal
deleted
inserted
replaced
130 if results is _MARKER: |
130 if results is _MARKER: |
131 registry = get_current_registry() |
131 registry = get_current_registry() |
132 adapter = registry.queryAdapter(self, IViewQuery, name='es') |
132 adapter = registry.queryAdapter(self, IViewQuery, name='es') |
133 if adapter is None: |
133 if adapter is None: |
134 adapter = registry.getAdapter(self, IViewQuery) |
134 adapter = registry.getAdapter(self, IViewQuery) |
135 if sort_index == RELEVANCE_ORDER: |
135 if (not sort_index) or (sort_index == RELEVANCE_ORDER): |
136 sort_index = None # keep natural order |
136 sort_index = None # keep natural order |
137 else: |
137 else: |
138 sort_index = self.order_by |
138 sort_index = self.order_by |
139 results, count = adapter.get_results(context, |
139 results, count = adapter.get_results(context, |
140 sort_index, |
140 sort_index, |