ouczbs/anki-word-query
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugs fix; Remove pos_gram span if pos_gram is blank.

Browse Source
This commit is contained in:
Javan Zhu 2019-04-12 21:37:18 +08:00
parent e3e76e22db
commit bb106a0d61
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons21/fastwq/service/dict/cambridge.py
View File

@ -63,23 +63,23 @@ class Cambridge(WebService):
else: else:
senses = element.find_all('div', id=re.compile("cald4*")) senses = element.find_all('div', id=re.compile("cald4*"))
# 词性 # 词性
pos = element.find('span', class_='pos') span_posgram = element.find('span', class_='posgram ico-bg')
gram = element.find('span', class_='gram') pos_gram = (span_posgram.get_text() if span_posgram else '')
pos_gram = (pos.get_text() if pos else '') + (gram.get_text() if gram else '')
if senses: if senses:
for sense in senses: for sense in senses:
# 像ambivalent之类词语含有ambivalence解释，词性不同 # 像ambivalent之类词语含有ambivalence解释，词性不同
pos_2 = sense.find('span', class_='pos') if sense['class'][0] == 'runon':
gram_2 = sense.find('span', class_='gram') runon_pos = sense.find('span', class_='pos')
if pos_2 is not None: runon_gram = sense.find('span', class_='gram')
pos_gram = (pos_2.get_text() if pos_2 else '') + (gram_2.get_text() if gram_2 else '') if runon_pos is not None:
pos_gram = (runon_pos.get_text() if runon_pos else '') + (runon_gram.get_text() if runon_gram else '')
sense_body = sense.find('div', class_=re.compile("sense-body|runon-body pad-indent")) sense_body = sense.find('div', class_=re.compile("sense-body|runon-body pad-indent"))
if sense_body: if sense_body:
l = result['def_list'] l = result['def_list']
phrase_name = None phrase = None
for block in sense_body: for block in sense_body:
if isinstance(block, Tag) is not True: if isinstance(block, Tag) is not True:
continue continue
@ -88,8 +88,8 @@ class Cambridge(WebService):
if block_type == 'def-block': if block_type == 'def-block':
pass pass
elif block_type == 'phrase-block': elif block_type == 'phrase-block':
phrase_title = block.find('span', class_='phrase-title') phrase_header = block.find('span', class_='phrase-head')
phrase_name = phrase_title.get_text() if phrase_title else None phrase = phrase_header.get_text() if phrase_header else None
pass pass
elif block_type == 'runon-body': elif block_type == 'runon-body':
pass pass
@ -102,8 +102,8 @@ class Cambridge(WebService):
examps = block.find_all('div', class_='examp emphasized') examps = block.find_all('div', class_='examp emphasized')
l.append( l.append(
u'<li>{0}{1}{2}{3} {4}{5}</li>'.format( u'<li>{0}{1}{2}{3} {4}{5}</li>'.format(
'<span class="epp-xref">{0}</span>'.format(pos_gram), '<span class="epp-xref">{0}</span>'.format(pos_gram) if pos_gram != "" else '',
'<span class="epp-xref">{0}</span>'.format(phrase_name) if phrase_name else '', '<span class="epp-xref">{0}</span>'.format(phrase) if phrase else '',
'<span class="epp-xref">{0}</span>'.format(i.get_text()) if i else '', '<span class="epp-xref">{0}</span>'.format(i.get_text()) if i else '',
'<b class="def">{0}</b>'.format(d.get_text()) if d else u'', '<b class="def">{0}</b>'.format(d.get_text()) if d else u'',