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

v1.0.15: fix var в индексах циклов parser.cfm

Browse Source
This commit is contained in:
naeel
2026-06-18 18:35:08 +04:00
parent 9201e36304
commit 595435adb2
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.cfm
+1 -1
View File
@@ -1 +1 @@
<cfsetting showdebugoutput=no enablecfoutputonly=yes><cfoutput>OK v1.0.14</cfoutput> <cfsetting showdebugoutput=no enablecfoutputonly=yes><cfoutput>OK v1.0.15</cfoutput>
parser.cfm
+10 -10
View File
@@ -27,12 +27,12 @@
<cfif NOT isNumeric(pdfDoc)> <cfif NOT isNumeric(pdfDoc)>
<cfset var stripper = createObject("java", "org.apache.pdfbox.text.PDFTextStripper")> <cfset var stripper = createObject("java", "org.apache.pdfbox.text.PDFTextStripper")>
<cfset var pageCount = pdfDoc.getNumberOfPages()> <cfset var pageCount = pdfDoc.getNumberOfPages()>
<cfloop from="1" to="#pageCount#" index="var pn"> <cfloop from="1" to="#pageCount#" index="pn">
<cfset stripper.setStartPage(pn)> <cfset stripper.setStartPage(pn)>
<cfset stripper.setEndPage(pn)> <cfset stripper.setEndPage(pn)>
<cfset var pageText = stripper.getText(pdfDoc)> <cfset var pageText = stripper.getText(pdfDoc)>
<cfif len(trim(pageText))> <cfif len(trim(pageText))>
<cfloop list="#pageText#" index="var line" delimiters="#chr(10)#"> <cfloop list="#pageText#" index="line" delimiters="#chr(10)#">
<cfset line = trim(line)> <cfset line = trim(line)>
<cfif len(line)> <cfif len(line)>
<cfset arrayAppend(out.elements, {type: "paragraph", style: "", text: line, page: pn})> <cfset arrayAppend(out.elements, {type: "paragraph", style: "", text: line, page: pn})>
@@ -97,7 +97,7 @@
</cftry> </cftry>
<cfif arrayLen(body) GT 0> <cfif arrayLen(body) GT 0>
<cfset body = body[1]> <cfset body = body[1]>
<cfloop array="#body.XmlChildren#" index="var child"> <cfloop array="#body.XmlChildren#" index="child">
<cfset var localName = child.XmlName> <cfset var localName = child.XmlName>
<cfif localName EQ "p" OR right(localName, 2) EQ ":p"> <cfif localName EQ "p" OR right(localName, 2) EQ ":p">
<cfset var paraText = ""> <cfset var paraText = "">
@@ -107,7 +107,7 @@
<cfset textNodes = xmlSearch(child, "//*[local-name()='t']")> <cfset textNodes = xmlSearch(child, "//*[local-name()='t']")>
</cfcatch> </cfcatch>
</cftry> </cftry>
<cfloop array="#textNodes#" index="var tn"> <cfloop array="#textNodes#" index="tn">
<cfset paraText &= tn.XmlText> <cfset paraText &= tn.XmlText>
</cfloop> </cfloop>
<cfset paraText = trim(paraText)> <cfset paraText = trim(paraText)>
@@ -122,7 +122,7 @@
<cfset trNodes = xmlSearch(child, "//*[local-name()='tr']")> <cfset trNodes = xmlSearch(child, "//*[local-name()='tr']")>
</cfcatch> </cfcatch>
</cftry> </cftry>
<cfloop array="#trNodes#" index="var trNode"> <cfloop array="#trNodes#" index="trNode">
<cfset var row = []> <cfset var row = []>
<cftry> <cftry>
<cfset var tcNodes = xmlSearch(trNode, ".//:tc")> <cfset var tcNodes = xmlSearch(trNode, ".//:tc")>
@@ -130,7 +130,7 @@
<cfset tcNodes = xmlSearch(trNode, ".//*[local-name()='tc']")> <cfset tcNodes = xmlSearch(trNode, ".//*[local-name()='tc']")>
</cfcatch> </cfcatch>
</cftry> </cftry>
<cfloop array="#tcNodes#" index="var tcNode"> <cfloop array="#tcNodes#" index="tcNode">
<cfset var cellText = ""> <cfset var cellText = "">
<cftry> <cftry>
<cfset var tNodes = xmlSearch(tcNode, ".//:t")> <cfset var tNodes = xmlSearch(tcNode, ".//:t")>
@@ -138,7 +138,7 @@
<cfset tNodes = xmlSearch(tcNode, ".//*[local-name()='t']")> <cfset tNodes = xmlSearch(tcNode, ".//*[local-name()='t']")>
</cfcatch> </cfcatch>
</cftry> </cftry>
<cfloop array="#tNodes#" index="var tNode"> <cfloop array="#tNodes#" index="tNode">
<cfset cellText &= tNode.XmlText> <cfset cellText &= tNode.XmlText>
</cfloop> </cfloop>
<cfset arrayAppend(row, trim(cellText))> <cfset arrayAppend(row, trim(cellText))>
@@ -216,7 +216,7 @@
<cfset arrayAppend(parsed.errors, "unsupported: .#zext#")> <cfset arrayAppend(parsed.errors, "unsupported: .#zext#")>
</cfif> </cfif>
<cfset prefix = doc.filename & "/"> <cfset prefix = doc.filename & "/">
<cfloop array="#parsed.elements#" index="var el"> <cfloop array="#parsed.elements#" index="el">
<cfset el.archive_path = prefix & zname> <cfset el.archive_path = prefix & zname>
<cfset arrayAppend(elements, el)> <cfset arrayAppend(elements, el)>
</cfloop> </cfloop>
@@ -225,7 +225,7 @@
element_count: arrayLen(parsed.elements), element_count: arrayLen(parsed.elements),
error_count: arrayLen(parsed.errors) error_count: arrayLen(parsed.errors)
})> })>
<cfloop array="#parsed.errors#" index="var e"> <cfloop array="#parsed.errors#" index="e">
<cfset arrayAppend(errors, zname & ": " & e)> <cfset arrayAppend(errors, zname & ": " & e)>
</cfloop> </cfloop>
<cfset zzis.closeEntry()> <cfset zzis.closeEntry()>
@@ -252,7 +252,7 @@
<cftry> <cftry>
<cfset fileBytes = binaryDecode(doc.original_bytes, "base64")> <cfset fileBytes = binaryDecode(doc.original_bytes, "base64")>
<cfset text = createObject("java", "java.lang.String").init(fileBytes, "UTF-8")> <cfset text = createObject("java", "java.lang.String").init(fileBytes, "UTF-8")>
<cfloop list="#text#" index="var line" delimiters="#chr(10)#"> <cfloop list="#text#" index="line" delimiters="#chr(10)#">
<cfset line = trim(line)> <cfset line = trim(line)>
<cfif len(line)> <cfif len(line)>
<cfset arrayAppend(elements, {type: "paragraph", style: "", text: line, page: 1})> <cfset arrayAppend(elements, {type: "paragraph", style: "", text: line, page: 1})>