From b1e993dbf518cc45cf9c9462737d9ac790ec10bf Mon Sep 17 00:00:00 2001 From: facat Date: Mon, 30 Dec 2019 23:00:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?bug=E3=80=82TA=E5=90=8C=E6=AD=A5=E5=88=B0S=E4=B8=AD=E6=97=B6?= =?UTF-8?q?=E8=80=90=E5=BC=A0=E5=A1=94=E5=91=BC=E9=AB=98=E5=8F=AA=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file_object.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/file_object.py b/file_object.py index dd5cca6..2a65515 100644 --- a/file_object.py +++ b/file_object.py @@ -54,11 +54,12 @@ class SFileObject: _content = [str(x) for x in content] file.write("{content}\n".format(content=" ".join(_content))) - def has(self, tower_number): # 塔位号是否存在S文件中。 + def has(self, tower_number): # 塔位号是否存在S文件中。可能存在多行的情况。 + indexes=[] for index, content in enumerate(self._content): if content[0] == tower_number: - return index - return 0 + indexes.append(index) + return indexes def content(self): return self._content @@ -79,8 +80,8 @@ class SFileAsSingle: ret = [] for s in s_file: d_file_obj = SFileObject(s) - index = d_file_obj.has(tower_number) - if index > 0: + indexes = d_file_obj.has(tower_number) + for index in indexes: ret.append((d_file_obj, index)) return ret