From da7bc7fc1fa1dcd5f62c08d8cca3b8bbd93863bc Mon Sep 17 00:00:00 2001 From: "St.Huang" Date: Sat, 15 Sep 2018 19:05:59 +0800 Subject: [PATCH] fix #54 --- addons/fastwq/service/dict/bing.py | 31 +++++++++++++------------ addons/fastwq/service/dict/bing3tp.py | 31 +++++++++++++------------ addons21/fastwq/service/dict/bing.py | 31 +++++++++++++------------ addons21/fastwq/service/dict/bing3tp.py | 31 +++++++++++++------------ 4 files changed, 64 insertions(+), 60 deletions(-) diff --git a/addons/fastwq/service/dict/bing.py b/addons/fastwq/service/dict/bing.py index 33ba47f..a4609f1 100644 --- a/addons/fastwq/service/dict/bing.py +++ b/addons/fastwq/service/dict/bing.py @@ -107,18 +107,19 @@ class Bing(WebService): def fld_samples(self): max_numbers = 10 segs = self._get_field('sams') - sentences = '' - for i, seg in enumerate(segs): - sentences += u"""
  • -
    {0}.{1}
    -
    {2}
    -
    • """.format(i+1, seg['eng'], seg['chn']) - if i == 9: - break - if sentences: - return u"""
    -
    -
      {0}
    -
    -
    """.format(sentences) - return '' + if segs: + sentences = u'' + for i, seg in enumerate(segs): + sentences += u"""
  • +
    {0}.{1}
    +
    {2}
    +
    • """.format(i+1, seg['eng'], seg['chn']) + if i == 9: + break + if sentences: + return u"""
    +
    +
      {0}
    +
    +
    """.format(sentences) + return u'' diff --git a/addons/fastwq/service/dict/bing3tp.py b/addons/fastwq/service/dict/bing3tp.py index 8424ba1..ba80b3d 100644 --- a/addons/fastwq/service/dict/bing3tp.py +++ b/addons/fastwq/service/dict/bing3tp.py @@ -72,18 +72,19 @@ class BingXtk(WebService): def fld_samples(self): max_numbers = 10 segs = self._get_field('sams') - sentences = '' - for i, seg in enumerate(segs): - sentences += u"""
  • -
    {0}
    -
    {1}
    -
    • """.format(seg['eng'], seg['chn']) - if i == 9: - break - if sentences: - return u"""
    -
    -
      {0}
    -
    -
    """.format(sentences) - return '' + if segs: + sentences = u'' + for i, seg in enumerate(segs): + sentences += u"""
  • +
    {0}
    +
    {1}
    +
    • """.format(seg['eng'], seg['chn']) + if i == 9: + break + if sentences: + return u"""
    +
    +
      {0}
    +
    +
    """.format(sentences) + return u'' diff --git a/addons21/fastwq/service/dict/bing.py b/addons21/fastwq/service/dict/bing.py index ae223e4..4a0bd98 100644 --- a/addons21/fastwq/service/dict/bing.py +++ b/addons21/fastwq/service/dict/bing.py @@ -107,18 +107,19 @@ class Bing(WebService): def fld_samples(self): max_numbers = 10 segs = self._get_field('sams') - sentences = '' - for i, seg in enumerate(segs): - sentences += u"""
  • -
    {0}.{1}
    -
    {2}
    -
    • """.format(i+1, seg['eng'], seg['chn']) - if i == 9: - break - if sentences: - return u"""
    -
    -
      {0}
    -
    -
    """.format(sentences) - return '' + if segs: + sentences = u'' + for i, seg in enumerate(segs): + sentences += u"""
  • +
    {0}.{1}
    +
    {2}
    +
    • """.format(i+1, seg['eng'], seg['chn']) + if i == 9: + break + if sentences: + return u"""
    +
    +
      {0}
    +
    +
    """.format(sentences) + return u'' diff --git a/addons21/fastwq/service/dict/bing3tp.py b/addons21/fastwq/service/dict/bing3tp.py index 8424ba1..ba80b3d 100644 --- a/addons21/fastwq/service/dict/bing3tp.py +++ b/addons21/fastwq/service/dict/bing3tp.py @@ -72,18 +72,19 @@ class BingXtk(WebService): def fld_samples(self): max_numbers = 10 segs = self._get_field('sams') - sentences = '' - for i, seg in enumerate(segs): - sentences += u"""
  • -
    {0}
    -
    {1}
    -
    • """.format(seg['eng'], seg['chn']) - if i == 9: - break - if sentences: - return u"""
    -
    -
      {0}
    -
    -
    """.format(sentences) - return '' + if segs: + sentences = u'' + for i, seg in enumerate(segs): + sentences += u"""
  • +
    {0}
    +
    {1}
    +
    • """.format(seg['eng'], seg['chn']) + if i == 9: + break + if sentences: + return u"""
    +
    +
      {0}
    +
    +
    """.format(sentences) + return u''