X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fparrot.git;a=blobdiff_plain;f=quotes.py;h=7391cf81849b804be125f3cdcbfa6ae11161b3a2;hp=76af335808035945ef12dea65109a9b111eb895b;hb=HEAD;hpb=98dc2aee69ea08613324a1c043ca5da98d674e4a

diff --git a/quotes.py b/quotes.py
index 76af335..7391cf8 100644
--- a/quotes.py
+++ b/quotes.py
@@ -54,7 +54,7 @@ class Quote(object):
     def jsonize(self):
         d = {"author" : self.author, "content" : self.content,
              "timestamp" : self.timestamp.strftime(u"%F_%T"),
-             "place" : self.place, "quoter" : self.quoter}
+             "place" : self.proper_place, "quoter" : self.proper_quoter}
         return d
     
     def __get_proper_place(self):
@@ -184,34 +184,42 @@ class QuoteDB(object):
         """ Sort une quote aléatoire de ``author`` """
         return random.choice(self.quotesfrom(author))
     
-    def search(self, inquote=None, author=None, regexp=False):
+    def search(self, inquote=None, author=None, place=None, regexp=False):
         """
         Fait une recherche dans les quotes.
-        C'est une disjonction de cas : on garde la quote si
+        C'est une conjonction de cas : on garde la quote si
         ``inquote`` matche dans le contenu
-        *ou* si ``author`` matche l'auteur
+        *et* si ``author`` matche l'auteur
+        *et* si ``place`` matche la place
         
         Si ``regexp=True``, utilise directement les termes comme des regexp.
         """
-        params = [inquote, author]
-        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])])]
+        params = [inquote, author, place]
+        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])])]
         return l
     
     def search_authors(self, author=None, regexp=False):
         """Renvoie la liste des auteurs contenant ``author`` ou qui matchent la regexp."""
-        if author is None:
-            author = u".*"
-        elif not regexp:
-            author = u".*%s.*" % author
-        areg = re.compile(author, flags=re.UNICODE + re.IGNORECASE)
-        l = list(set([q.author for q in self.quotelist if areg.match(q.author)]))
+        if regexp:
+            if author is None:
+                author = u".*"
+            areg = re.compile(author, flags=re.UNICODE + re.IGNORECASE)
+            l = list(set([q.author for q in self.quotelist if areg.match(q.author)]))
+        else:
+            if author is None:
+                author = u""
+            l = list(set([q.author for q in self.quotelist if author.lower() in q.author.lower()]))
         return l
 
 def dump(quotedb, dump_file=None):