|
|
@@ -1735,9 +1735,9 @@ def tableToText(soup, docid=None, return_kv=False):
|
|
|
# print('inner_table111', inner_table)
|
|
|
|
|
|
if return_kv:
|
|
|
- text, table = get_table_text_kv(inner_table, head_list)
|
|
|
- kv_list, kv_dict_list = process_dict(text, table)
|
|
|
- tbody.string = text
|
|
|
+ text1, table = get_table_text_kv(inner_table, head_list)
|
|
|
+ tbody.string = text1
|
|
|
+ kv_list, kv_dict_list = process_dict(text1, table)
|
|
|
# html放入dict
|
|
|
for kv_dict in kv_dict_list:
|
|
|
html = html_table[kv_dict.get('value_row_index')][kv_dict.get('value_col_index')]
|
|
|
@@ -1749,7 +1749,7 @@ def tableToText(soup, docid=None, return_kv=False):
|
|
|
# print(tbody.string)
|
|
|
tbody.name = "turntable"
|
|
|
if return_kv:
|
|
|
- return inner_table, kv_dict_list, text
|
|
|
+ return inner_table, kv_dict_list, text1
|
|
|
else:
|
|
|
return inner_table
|
|
|
if return_kv:
|
|
|
@@ -1847,8 +1847,9 @@ def tableToText(soup, docid=None, return_kv=False):
|
|
|
|
|
|
if return_kv:
|
|
|
kv_list = [x[1] for x in list_innerTable]
|
|
|
+ text = [x[2] for x in list_innerTable]
|
|
|
list_innerTable = [x[0] for x in list_innerTable]
|
|
|
- return soup, kv_list
|
|
|
+ return soup, kv_list, text
|
|
|
return soup
|
|
|
# return list_innerTable
|
|
|
|
