mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
wrap the remaining really long lines
This commit is contained in:
Damien Elmes
parent
4cce768c70
commit
731c4100f9
1 changed files with 44 additions and 18 deletions
62
anki/deck.py
62
anki/deck.py
|
|
@ -2347,7 +2347,8 @@ where id = :id""", pending)
|
||||||
fieldName = filter['field'].lower()
|
fieldName = filter['field'].lower()
|
||||||
if (fieldName in cardFilters) is False:
|
if (fieldName in cardFilters) is False:
|
||||||
cardFilters[fieldName] = []
|
cardFilters[fieldName] = []
|
||||||
regexp = re.compile(r'\b' + re.escape(filter['value']) + r'\b', flags=re.I)
|
regexp = re.compile(r'\b' + re.escape(filter['value']) +
|
||||||
|
r'\b', flags=re.I)
|
||||||
cardFilters[fieldName].append(
|
cardFilters[fieldName].append(
|
||||||
{'value': filter['value'], 'regexp': regexp,
|
{'value': filter['value'], 'regexp': regexp,
|
||||||
'is_neg': filter['is_neg']})
|
'is_neg': filter['is_neg']})
|
||||||
|
|
@ -2490,11 +2491,14 @@ where id = :id""", pending)
|
||||||
elif isNeg:
|
elif isNeg:
|
||||||
tquery += "select id from cards except "
|
tquery += "select id from cards except "
|
||||||
if token == "none":
|
if token == "none":
|
||||||
tquery += """select cards.id from cards, facts where facts.tags = '' and cards.factId = facts.id """
|
tquery += """
|
||||||
|
select cards.id from cards, facts where facts.tags = '' and cards.factId = facts.id """
|
||||||
else:
|
else:
|
||||||
token = token.replace("*", "%")
|
token = token.replace("*", "%")
|
||||||
ids = self.s.column0("select id from tags where tag like :tag escape '\\'", tag=token)
|
ids = self.s.column0("""
|
||||||
tquery += """select cardId from cardTags where cardTags.tagId in %s""" % ids2str(ids)
|
select id from tags where tag like :tag escape '\\'""", tag=token)
|
||||||
|
tquery += """
|
||||||
|
select cardId from cardTags where cardTags.tagId in %s""" % ids2str(ids)
|
||||||
elif type == SEARCH_TYPE:
|
elif type == SEARCH_TYPE:
|
||||||
if qquery:
|
if qquery:
|
||||||
if isNeg:
|
if isNeg:
|
||||||
|
|
@ -2537,15 +2541,18 @@ where id = :id""", pending)
|
||||||
fidquery += "select id from cards where factId = %s" % token
|
fidquery += "select id from cards where factId = %s" % token
|
||||||
elif type == SEARCH_CARD:
|
elif type == SEARCH_CARD:
|
||||||
token = token.replace("*", "%")
|
token = token.replace("*", "%")
|
||||||
ids = self.s.column0("select id from tags where tag like :tag escape '\\'", tag=token)
|
ids = self.s.column0("""
|
||||||
|
select id from tags where tag like :tag escape '\\'""", tag=token)
|
||||||
if isNeg:
|
if isNeg:
|
||||||
if cmquery['neg']:
|
if cmquery['neg']:
|
||||||
cmquery['neg'] += " intersect "
|
cmquery['neg'] += " intersect "
|
||||||
cmquery['neg'] += """select cardId from cardTags where src = 2 and cardTags.tagId in %s""" % ids2str(ids)
|
cmquery['neg'] += """
|
||||||
|
select cardId from cardTags where src = 2 and cardTags.tagId in %s""" % ids2str(ids)
|
||||||
else:
|
else:
|
||||||
if cmquery['pos']:
|
if cmquery['pos']:
|
||||||
cmquery['pos'] += " intersect "
|
cmquery['pos'] += " intersect "
|
||||||
cmquery['pos'] += """select cardId from cardTags where src = 2 and cardTags.tagId in %s""" % ids2str(ids)
|
cmquery['pos'] += """
|
||||||
|
select cardId from cardTags where src = 2 and cardTags.tagId in %s""" % ids2str(ids)
|
||||||
elif type == SEARCH_FIELD or type == SEARCH_FIELD_EXISTS:
|
elif type == SEARCH_FIELD or type == SEARCH_FIELD_EXISTS:
|
||||||
field = value = ''
|
field = value = ''
|
||||||
if type == SEARCH_FIELD:
|
if type == SEARCH_FIELD:
|
||||||
|
|
@ -2557,7 +2564,10 @@ where id = :id""", pending)
|
||||||
field = token
|
field = token
|
||||||
value = '*'
|
value = '*'
|
||||||
if (type == SEARCH_FIELD and filter != 'none'):
|
if (type == SEARCH_FIELD and filter != 'none'):
|
||||||
if field and value: filters.append({'scope': 'field', 'type': filter, 'field': field, 'value': value, 'is_neg': isNeg})
|
if field and value:
|
||||||
|
filters.append(
|
||||||
|
{'scope': 'field', 'type': filter,
|
||||||
|
'field': field, 'value': value, 'is_neg': isNeg})
|
||||||
else:
|
else:
|
||||||
if field and value:
|
if field and value:
|
||||||
if sfquery:
|
if sfquery:
|
||||||
|
|
@ -2570,8 +2580,11 @@ where id = :id""", pending)
|
||||||
field = field.replace("*", "%")
|
field = field.replace("*", "%")
|
||||||
value = value.replace("*", "%")
|
value = value.replace("*", "%")
|
||||||
args["_ff_%d" % c] = "%"+value+"%"
|
args["_ff_%d" % c] = "%"+value+"%"
|
||||||
ids = self.s.column0("select id from fieldmodels where name like :field escape '\\'", field=field)
|
ids = self.s.column0("""
|
||||||
sfquery += "select factId from fields where fieldModelId in %s and value like :_ff_%d escape '\\'" % (ids2str(ids), c)
|
select id from fieldmodels where name like :field escape '\\'""", field=field)
|
||||||
|
sfquery += """
|
||||||
|
select factId from fields where fieldModelId in %s and
|
||||||
|
value like :_ff_%d escape '\\'""" % (ids2str(ids), c)
|
||||||
elif type == SEARCH_QA:
|
elif type == SEARCH_QA:
|
||||||
field = value = ''
|
field = value = ''
|
||||||
parts = token.split(':', 1);
|
parts = token.split(':', 1);
|
||||||
|
|
@ -2579,7 +2592,10 @@ where id = :id""", pending)
|
||||||
field = parts[0]
|
field = parts[0]
|
||||||
value = parts[1]
|
value = parts[1]
|
||||||
if (filter != 'none'):
|
if (filter != 'none'):
|
||||||
if field and value: filters.append({'scope': 'card', 'type': filter, 'field': field, 'value': value, 'is_neg': isNeg})
|
if field and value:
|
||||||
|
filters.append(
|
||||||
|
{'scope': 'card', 'type': filter, 'field': field,
|
||||||
|
'value': value, 'is_neg': isNeg})
|
||||||
else:
|
else:
|
||||||
if field and value:
|
if field and value:
|
||||||
if qaquery:
|
if qaquery:
|
||||||
|
|
@ -2592,14 +2608,22 @@ where id = :id""", pending)
|
||||||
value = value.replace("*", "%")
|
value = value.replace("*", "%")
|
||||||
args["_ff_%d" % c] = "%"+value+"%"
|
args["_ff_%d" % c] = "%"+value+"%"
|
||||||
|
|
||||||
if field == 'question': qaquery += "select id from cards where question like :_ff_%d escape '\\'" % c
|
if field == 'question':
|
||||||
else: qaquery += "select id from cards where answer like :_ff_%d escape '\\'" % c
|
qaquery += """
|
||||||
|
select id from cards where question like :_ff_%d escape '\\'""" % c
|
||||||
|
else:
|
||||||
|
qaquery += """
|
||||||
|
select id from cards where answer like :_ff_%d escape '\\'""" % c
|
||||||
elif type == SEARCH_DISTINCT:
|
elif type == SEARCH_DISTINCT:
|
||||||
if isNeg is False: showdistinct = True if token == "one" else False
|
if isNeg is False:
|
||||||
else: showdistinct = False if token == "one" else True
|
showdistinct = True if token == "one" else False
|
||||||
|
else:
|
||||||
|
showdistinct = False if token == "one" else True
|
||||||
else:
|
else:
|
||||||
if (filter != 'none'):
|
if (filter != 'none'):
|
||||||
filters.append({'scope': 'fact', 'type': filter, 'value': token, 'is_neg': isNeg})
|
filters.append(
|
||||||
|
{'scope': 'fact', 'type': filter,
|
||||||
|
'value': token, 'is_neg': isNeg})
|
||||||
else:
|
else:
|
||||||
if fquery:
|
if fquery:
|
||||||
if isNeg:
|
if isNeg:
|
||||||
|
|
@ -2610,8 +2634,10 @@ where id = :id""", pending)
|
||||||
fquery += "select id from facts except "
|
fquery += "select id from facts except "
|
||||||
token = token.replace("*", "%")
|
token = token.replace("*", "%")
|
||||||
args["_ff_%d" % c] = "%"+token+"%"
|
args["_ff_%d" % c] = "%"+token+"%"
|
||||||
fquery += "select factId from fields where value like :_ff_%d escape '\\'" % c
|
fquery += """
|
||||||
return (tquery, fquery, qquery, fidquery, cmquery, sfquery, qaquery, showdistinct, filters, args)
|
select factId from fields where value like :_ff_%d escape '\\'""" % c
|
||||||
|
return (tquery, fquery, qquery, fidquery, cmquery, sfquery,
|
||||||
|
qaquery, showdistinct, filters, args)
|
||||||
|
|
||||||
# Find and replace
|
# Find and replace
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue