diff --git a/ADC_function.py b/ADC_function.py index 77f00f7..e310dd5 100644 --- a/ADC_function.py +++ b/ADC_function.py @@ -566,3 +566,12 @@ def delete_all_elements_in_list(string: str, lists: typing.Iterable[str]): if i != string: new_lists.append(i) return new_lists + +def delete_all_elements_in_str(string_delete: str, string: str): + """ + delete same string in given list + """ + for i in string: + if i == string_delete: + string = string.replace(i,"") + return string \ No newline at end of file diff --git a/WebCrawler/__init__.py b/WebCrawler/__init__.py index 8d291db..d467eab 100644 --- a/WebCrawler/__init__.py +++ b/WebCrawler/__init__.py @@ -275,7 +275,7 @@ def get_data_from_json(file_number, oCC): if len(mapping_data.xpath('a[contains(@keyword, $name)]/@' + language, name=vars)) != 0: return mapping_data.xpath('a[contains(@keyword, $name)]/@' + language, name=vars)[0] else: - return vars + raise IndexError('keyword not found') for cc in cc_vars: if json_data[cc] == "" or len(json_data[cc]) == 0: continue @@ -303,20 +303,20 @@ def get_data_from_json(file_number, oCC): json_data[cc] = ADC_function.delete_all_elements_in_list("删除", json_data[cc]) elif ccm == 3: json_data[cc] = convert_list(info_mapping_data, "jp", json_data[cc]) - json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + json_data[cc] = ADC_function.delete_all_elements_in_list("删除", json_data[cc]) except: json_data[cc] = [oCC.convert(t) for t in json_data[cc]] else: try: if ccm == 1: json_data[cc] = convert(info_mapping_data, "zh_cn", json_data[cc]) - json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + json_data[cc] = ADC_function.delete_all_elements_in_str("删除", json_data[cc]) elif ccm == 2: json_data[cc] = convert(info_mapping_data, "zh_tw", json_data[cc]) - json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + json_data[cc] = ADC_function.delete_all_elements_in_str("删除", json_data[cc]) elif ccm == 3: json_data[cc] = convert(info_mapping_data, "jp", json_data[cc]) - json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + json_data[cc] = ADC_function.delete_all_elements_in_str("删除", json_data[cc]) except IndexError: json_data[cc] = oCC.convert(json_data[cc]) except: