- regexps = []
- for param in params:
- if param is None:
- param = u".*"
- elif not regexp:
- param = u".*%s.*" % param
- regexps.append(re.compile(param, flags=re.UNICODE + re.IGNORECASE))
- l = [q for q in self.quotelist if all([reg.match(truc) for (reg, truc) in zip(regexps, [q.content, q.author])])]
+ if regexp:
+ regexps = []
+ for param in params:
+ if param is None:
+ param = u".*"
+ regexps.append(re.compile(param, flags=re.UNICODE + re.IGNORECASE))
+ l = [q for q in self.quotelist if all([reg.match(truc) for (reg, truc) in zip(regexps, [q.content, q.author, q.proper_place])])]
+ else:
+ for (i, param) in enumerate(params):
+ if param is None:
+ params[i] = u""
+ l = [q for q in self.quotelist if all([param.lower() in truc.lower() for (param, truc) in zip(params, [q.content, q.author, q.proper_place])])]