Use correct capitalization for solr "OR"

Allura/allura/ext/personal_dashboard/dashboard_main.py

@@ -70,7 +70,7 @@ class TicketsSection(DashboardSectionBase):
     def query_tickets(self, page, limit):
         from forgetracker.model import Ticket
 
-        q = ' or '.join(['assigned_to:' + str(self.user['username']), 'reported_by:' + str(self.user['username'])])
+        q = ' OR '.join(['assigned_to:' + str(self.user['username']), 'reported_by:' + str(self.user['username'])])
         sort = 'mod_date_dt desc'
         result = Ticket.paged_search(None, self.user, q, limit=limit, page=page, sort=sort)
 

Allura/allura/lib/solr.py

@@ -16,11 +16,16 @@
 #       under the License.
 
 import shlex
+import logging
 
 from tg import config
 from paste.deploy.converters import asbool
 import pysolr
 
+
+log = logging.getLogger(__name__)
+
+
 escape_rules = {'+': r'\+',
                 '-': r'\-',
                 '&': r'\&',
@@ -153,7 +158,10 @@ def search(self, q, fq=None, **kw):
         if fq:
             q_parts += fq
         for part in q_parts:
-            if part == '&&':
+            if part in ('&&', 'AND'):
+                continue
+            if part in ('||', 'OR'):
+                log.warn("MockSOLR doesn't implement OR yet; treating as AND")
                 continue
             if ':' in part:
                 field, value = part.split(':', 1)

ForgeTracker/forgetracker/model/ticket.py

@@ -161,7 +161,7 @@ def not_closed_mongo_query(self):
 
     @property
     def closed_query(self):
-        return ' or '.join(['status:' + name for name in self.set_of_closed_status_names])
+        return ' OR '.join(['status:' + name for name in self.set_of_closed_status_names])
 
     @property
     def milestone_fields(self):