mirrors/docling
1
0
Fork 0
mirror of https://github.com/DS4SD/docling.git synced 2025-07-23 18:45:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf(msexcel): _find_table_bounds use iter_rows/iter_cols instead of sheet.cell

Browse Source
This commit is contained in:
Qiefan Jiang 2025-07-01 18:49:52 +08:00
parent 56a0e104f7
commit 274102a8d4
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
docling/backend/msexcel_backend.py
View File

@ -337,10 +337,14 @@ class MsExcelDocumentBackend(DeclarativeDocumentBackend, PaginatedDocumentBacken
# Collect the data within the bounds
data = []
visited_cells: set[tuple[int, int]] = set()
for ri in range(start_row, max_row + 1):
for rj in range(start_col, max_col + 1):
cell = sheet.cell(row=ri + 1, column=rj + 1) # 1-based indexing
for ri, row in enumerate(sheet.iter_rows(
min_row=start_row + 1, # start_row is 0-based but iter_rows is 1-based
max_row=max_row + 1,
min_col=start_col + 1,
max_col=max_col + 1,
values_only=False
), start_row):
for rj, cell in enumerate(row, start_col):
# Check if the cell belongs to a merged range
row_span = 1
col_span = 1
@ -397,10 +401,13 @@ class MsExcelDocumentBackend(DeclarativeDocumentBackend, PaginatedDocumentBacken
"""
max_row: int = start_row
while max_row < sheet.max_row - 1:
# Get the cell value or check if it is part of a merged cell
cell = sheet.cell(row=max_row + 2, column=start_col + 1)
for ri, (cell,) in enumerate(sheet.iter_rows(
min_row=start_row + 2,
max_row=sheet.max_row,
min_col=start_col + 1,
max_col=start_col + 1,
values_only=False
), start_row + 1):
# Check if the cell is part of a merged range
merged_range = next(
(mr for mr in sheet.merged_cells.ranges if cell.coordinate in mr),
@ -414,7 +421,7 @@ class MsExcelDocumentBackend(DeclarativeDocumentBackend, PaginatedDocumentBacken
if merged_range:
max_row = max(max_row, merged_range.max_row - 1)
else:
max_row += 1
max_row = ri
return max_row
@ -433,10 +440,13 @@ class MsExcelDocumentBackend(DeclarativeDocumentBackend, PaginatedDocumentBacken
"""
max_col: int = start_col
while max_col < sheet.max_column - 1:
# Get the cell value or check if it is part of a merged cell
cell = sheet.cell(row=start_row + 1, column=max_col + 2)
for rj, (cell,) in enumerate(sheet.iter_cols(
min_row=start_row + 1,
max_row=start_row + 1,
min_col=start_col + 2,
max_col=sheet.max_column,
values_only=False
), start_col + 1):
# Check if the cell is part of a merged range
merged_range = next(
(mr for mr in sheet.merged_cells.ranges if cell.coordinate in mr),
@ -450,7 +460,7 @@ class MsExcelDocumentBackend(DeclarativeDocumentBackend, PaginatedDocumentBacken
if merged_range:
max_col = max(max_col, merged_range.max_col - 1)
else:
max_col += 1
max_col = rj
return max_col