Nail/contractor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.79: .doc → XWPF первым (после конвертации), HWPF только fallback

Browse Source
This commit is contained in:
naeel
2026-06-21 08:07:59 +04:00
parent 9eaa6d1f08
commit 0be35bd3db
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parser.cfm
+24 -6
View File
@@ -318,9 +318,18 @@
<cfset parsed = parseDOCX(entryBytes)> <cfset parsed = parseDOCX(entryBytes)>
</cfif> </cfif>
<cfelseif zext EQ "doc"> <cfelseif zext EQ "doc">
<cfset parsed = parseDOC_POI(entryBytes)> <!--- После конвертации это уже docx — пробуем XWPF первым --->
<cfif arrayLen(parsed.elements) EQ 0 AND arrayLen(parsed.errors) GT 0> <cftry>
<cfset parsed = parseDOC(entryBytes)> <cfset parsed = parseDOCX(entryBytes)>
<cfcatch>
<cfset parsed = {elements: [], errors: ["XWPF fallback: " & cfcatch.message]}>
</cfcatch>
</cftry>
<cfif arrayLen(parsed.elements) EQ 0>
<cfset parsed = parseDOC_POI(entryBytes)>
<cfif arrayLen(parsed.elements) EQ 0 AND arrayLen(parsed.errors) GT 0>
<cfset parsed = parseDOC(entryBytes)>
</cfif>
</cfif> </cfif>
<cfelse> <cfelse>
<cfset arrayAppend(parsed.errors, "unsupported: .#zext#")> <cfset arrayAppend(parsed.errors, "unsupported: .#zext#")>
@@ -379,9 +388,18 @@
<cfelseif doc.mime_type EQ "application/msword"> <cfelseif doc.mime_type EQ "application/msword">
<cfset fileBytes = binaryDecode(doc.original_bytes, "base64")> <cfset fileBytes = binaryDecode(doc.original_bytes, "base64")>
<cfset parsed = parseDOC_POI(fileBytes)> <!--- После конвертации на ВМ это уже docx — пробуем XWPF первым --->
<cfif arrayLen(parsed.elements) EQ 0 AND arrayLen(parsed.errors) GT 0> <cftry>
<cfset parsed = parseDOC(fileBytes)> <cfset parsed = parseDOCX(fileBytes)>
<cfcatch>
<cfset parsed = {elements: [], errors: ["XWPF fallback: " & cfcatch.message]}>
</cfcatch>
</cftry>
<cfif arrayLen(parsed.elements) EQ 0>
<cfset parsed = parseDOC_POI(fileBytes)>
<cfif arrayLen(parsed.elements) EQ 0 AND arrayLen(parsed.errors) GT 0>
<cfset parsed = parseDOC(fileBytes)>
</cfif>
</cfif> </cfif>
<cfset elements = parsed.elements> <cfset elements = parsed.elements>
<cfset errors = parsed.errors> <cfset errors = parsed.errors>