[CMF-checkins] CVS: CMF/CMFCollector/skins/collector - collector_search.py:1.8

[Ken Manheimer]

Update of /cvs-repository/CMF/CMFCollector/skins/collector
In directory cvs.zope.org:/tmp/cvs-serv9678

Modified Files:
	collector_search.py 
Log Message:
Dealing with the simplified security_related selection values.


=== CMF/CMFCollector/skins/collector/collector_search.py 1.7 => 1.8 ===
 supplement_subject_one("reported_version")
 
-sr = reqget("security_related", 'x')
-if sr in ['0', '1']:
-    subj_items.append('security_related:%s' % sr)
+sr = reqget("security_related", [])
+
+if sr:
+    if 'Yes' in sr and 'No' in sr:
+        pass
+    elif 'Yes' in sr:
+        subj_items.append('security_related:1')
+    else:
+        subj_items.append('security_related:0')
 
 if subj_items:
     query["Subject"] = subj_items