catalog deprecation warning about _usage
Alexis Roda <[email protected]> Tue, 13 Nov 2007 19:38:10 +0100
| Newsgroups | gmane.comp.web.zope.silva.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi, attached is a patch for SilvaNewsNetwork 2.5 that removes some DeprecationWarning thrown by the catalog regarding 'xxx_usage' queries. Regards Alexis Roda _______________________________________________ silva-dev mailing list silva-dev-IAPFreCvJWM6s/[email protected] https://lists.infrae.com/mailman/listinfo/silva-dev
patch.diff
(text/x-patch, 7.1 KB)
diff -U4 ../tmp/SilvaNews/AgendaFilter.py ./AgendaFilter.py
--- ../tmp/SilvaNews/AgendaFilter.py 2007-05-24 13:04:15.000000000 +0200
+++ ./AgendaFilter.py 2007-11-10 18:07:48.000000000 +0100
@@ -83,10 +83,11 @@
lastnight = DateTime().earliestTime()
enddate = lastnight + numdays
result_enddt = self._query(
- idx_end_datetime = (lastnight, enddate),
- idx_end_datetime_usage = 'range:min:max',
+ idx_end_datetime = { 'query' : (lastnight, enddate),
+ 'range' : 'minmax'
+ },
version_status = 'public',
path = self._sources,
idx_subjects = {'query': self._subjects,
'operator': 'or'},
@@ -100,10 +101,11 @@
if not item.object_path in self._excluded_items:
result.append(item)
result_startdt = self._query(
- idx_start_datetime = (lastnight, enddate),
- idx_start_datetime_usage = 'range:min:max',
+ idx_start_datetime = { 'query' : (lastnight, enddate),
+ 'range' : 'minmax'
+ },
version_status = 'public',
path = self._sources,
idx_subjects = {'query': self._subjects,
'operator': 'or'},
@@ -185,10 +187,11 @@
result = []
# first query for objects that do have an end datetime defined
query = {}
- query['idx_end_datetime'] = [startdate, enddate]
- query['idx_end_datetime_usage'] = 'range:min:max'
+ query['idx_end_datetime'] = { 'query' : (startdate, enddate),
+ 'range' : 'minmax'
+ }
query['version_status'] = 'public'
query['path'] = self._sources
query['idx_subjects'] = {'query': self._subjects,
'operator': 'or'}
@@ -204,10 +207,11 @@
result.append(item)
# now those that don't have end_datetime
query = {}
- query['idx_start_datetime'] = [startdate, enddate]
- query['idx_start_datetime_usage'] = 'range:min:max'
+ query['idx_start_datetime'] = { 'query' : (startdate, enddate),
+ 'range' : 'minmax'
+ }
query['version_status'] = 'public'
query['path'] = self._sources
query['idx_subjects'] = {'query': self._subjects,
'operator': 'or'}
@@ -256,9 +260,9 @@
result = []
# end_datetime items first
query = {}
- query['idx_end_datetime'] = {'query': [startdate, enddate],
+ query['idx_end_datetime'] = {'query': (startdate, enddate),
'range': 'minmax'}
query['version_status'] = 'public'
query['path'] = self._sources
query['idx_subjects'] = {'query': self._subjects,
@@ -274,9 +278,9 @@
if item.object_path not in self._excluded_items:
result.append(item)
query = {}
- query['idx_start_datetime'] = {'query': [startdate, enddate],
+ query['idx_start_datetime'] = {'query': (startdate, enddate),
'range': 'minmax'}
query['version_status'] = 'public'
query['path'] = self._sources
query['idx_subjects'] = {'query': self._subjects,
@@ -321,10 +325,11 @@
enddate = DateTime(year, endmonth, 1)
# end dt first
query = {}
- query['idx_end_datetime'] = [startdate, enddate]
- query['idx_end_datetime_usage'] = 'range:min:max'
+ query['idx_end_datetime'] = { 'query' : (startdate, enddate),
+ 'range' : 'minmax'
+ }
query['version_status'] = 'public'
query['path'] = self._sources
query['idx_subjects'] = self._subjects
query['idx_target_audiences'] = self._target_audiences
@@ -333,10 +338,11 @@
query['sort_order'] = 'ascending'
result = self.service_catalog(query)
query = {}
- query['idx_start_datetime'] = [startdate, enddate]
- query['idx_start_datetime_usage'] = 'range:min:max'
+ query['idx_start_datetime'] = { 'query' : (startdate, enddate),
+ 'range' : 'minmax'
+ }
query['version_status'] = 'public'
query['path'] = self._sources
query['idx_subjects'] = self._subjects
query['idx_target_audiences'] = self._target_audiences
diff -U4 ../tmp/SilvaNews/NewsFilter.py ./NewsFilter.py
--- ../tmp/SilvaNews/NewsFilter.py 2007-05-24 13:04:15.000000000 +0200
+++ ./NewsFilter.py 2007-11-10 18:07:48.000000000 +0100
@@ -124,19 +124,21 @@
result = []
# first query for items that have an end_datetime defined
query = self._prepare_query(meta_types)
- query['idx_end_datetime'] = (lastnight, enddate)
- query['idx_end_datetime_usage'] = 'range:min:max'
+ query['idx_end_datetime'] = { 'query' : (lastnight, enddate),
+ 'range' : 'minmax'
+ }
result_enddt = self.service_catalog(query)
for item in result_enddt:
if item.object_path not in self._excluded_items:
result.append(item)
query = self._prepare_query(meta_types)
- query['idx_start_datetime'] = (lastnight, enddate)
- query['idx_start_datetime_usage'] = 'range:min:max'
+ query['idx_start_datetime'] = { 'query' : (lastnight, enddate),
+ 'range' : 'minmax'
+ }
result_startdt = self.service_catalog(query)
for item in result_startdt:
if (item.object_path not in self._excluded_items and
@@ -196,19 +198,21 @@
result = []
# first query for items that have an end_datetime defined
query = self._prepare_query(meta_types)
- query['idx_end_datetime'] = (startdate, enddate)
- query['idx_end_datetime_usage'] = 'range:min:max'
+ query['idx_end_datetime'] = { 'query' : (startdate, enddate),
+ 'range' : 'minmax'
+ }
result_enddt = self.service_catalog(query)
for item in result_enddt:
if item.object_path not in self._excluded_items:
result.append(item)
query = self._prepare_query(meta_types)
- query['idx_start_datetime'] = (startdate, enddate)
- query['idx_start_datetime_usage'] = 'range:min:max'
+ query['idx_start_datetime'] = { 'query' : (startdate, enddate),
+ 'range' : 'minmax'
+ }
result_startdt = self.service_catalog(query)
for item in result_startdt:
if (item.object_path not in self._excluded_items and