From 0be35bd3db6ee958272ea90bc602d915750bf7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Sun, 21 Jun 2026 08:07:59 +0400
Subject: [PATCH] =?UTF-8?q?v1.0.79:=20.doc=20=E2=86=92=20XWPF=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B2=D1=8B=D0=BC=20(=D0=BF=D0=BE=D1=81=D0=BB?=
 =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D1=80=D1=82=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8),=20HWPF=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?=
 =?UTF-8?q?fallback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parser.cfm | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/parser.cfm b/parser.cfm
index 792a01b..d6b7a2f 100644
--- a/parser.cfm
+++ b/parser.cfm
@@ -318,9 +318,18 @@
                                 <cfset parsed = parseDOCX(entryBytes)>
                             </cfif>
                         <cfelseif zext EQ "doc">
-                            <cfset parsed = parseDOC_POI(entryBytes)>
-                            <cfif arrayLen(parsed.elements) EQ 0 AND arrayLen(parsed.errors) GT 0>
-                                <cfset parsed = parseDOC(entryBytes)>
+                            <!--- После конвертации это уже docx — пробуем XWPF первым --->
+                            <cftry>
+                                <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>
                         <cfelse>
                             <cfset arrayAppend(parsed.errors, "unsupported: .#zext#")>
@@ -379,9 +388,18 @@
 
             <cfelseif doc.mime_type EQ "application/msword">
                 <cfset fileBytes = binaryDecode(doc.original_bytes, "base64")>
-                <cfset parsed = parseDOC_POI(fileBytes)>
-                <cfif arrayLen(parsed.elements) EQ 0 AND arrayLen(parsed.errors) GT 0>
-                    <cfset parsed = parseDOC(fileBytes)>
+                <!--- После конвертации на ВМ это уже docx — пробуем XWPF первым --->
+                <cftry>
+                    <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>
                 <cfset elements = parsed.elements>
                 <cfset errors = parsed.errors>