drime

commit f82066fea0d4481b43b3d0cfa0218d873bd77610
parent 292f47ffdd81b4438548f7d5390efb6805166b82
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Fri, 20 Dec 2013 23:27:58 +0100

Merge branch 'master' of mu.a3nm.net:git/drime

Diffstat:
README
 | 
6
+++---
query.py
 | 
5
+++--

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/README b/README
@@ -15,9 +15,9 @@ drime requires a working Python3 installation.
 
 drime requires the haspirater module <http://gitorious.org/haspirater/>. Just
 place the "haspirater.py" and "haspirater.json" file in the same folder as the
-other files. It also requires the "rhyme.py" module from plint
-<http://gitorious.org/plint/> that you should put in the same folder, and also
-"frhyme.py" (see plint's documentation).
+other files. It also requires the "rhyme.py" and "options.py" modules from
+plint <http://gitorious.org/plint/> that you should put in the same folder, and
+also "frhyme.py" (see plint's documentation).
 
 drime also requires PyMySQL <http://www.pymysql.org> and Flask
 <http://flask.pocoo.org/> for Python3.
diff --git a/query.py b/query.py
@@ -7,6 +7,7 @@ import operator
 from db_mysql import run_query
 from common import from_xsampa, to_xsampa
 from rhyme import Rhyme, Constraint, escape
+from options import default_options
 import frhyme
 from lexique2sql import Word
 
@@ -162,9 +163,9 @@ def do_query(word, phon, minsyll, maxsyll, elide, gender, classical, offset, siz
       continue # don't display the word if it has only one possible origin
     if classical:
       rhyme = Rhyme(word, constraint,
-          phon=[phon])
+              phon=[phon], mergers=[], options=default_options)
       rhyme.restrict(Rhyme(row['word'], constraint,
-          phon=[row['phon']]))
+          phon=[row['phon']], mergers=[], options=default_options))
       if not rhyme.satisfied():
         continue # discard words following classical rules
     row['freq'] = float(row['freq'])