From 859b369b9fc8499bb53c332a84cdb095df934ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Thu, 18 Jun 2026 17:58:09 +0400
Subject: [PATCH] =?UTF-8?q?v1.0.9:=20extractor.cfm=20=E2=80=94=20lowercase?=
 =?UTF-8?q?=20JSON=20keys=20+=20fix=20JSON=20parsing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extractor.cfm | 42 ++++++++++++++++++++++++++++++------------
 index.cfm     |  2 +-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/extractor.cfm b/extractor.cfm
index be4c0d3..e101894 100644
--- a/extractor.cfm
+++ b/extractor.cfm
@@ -79,10 +79,10 @@
             <!--- Вызов LLM --->
             <cfset apiKey = "sk-ucI5YvOticoOQ9Kuj5K9mQ">
             <cfset llmPayload = {
-                model: "gpt-oss-120b",
-                messages: [{role: "user", content: prompt}],
-                max_tokens: 8000,
-                temperature: 0.1
+                "model": "gpt-oss-120b",
+                "messages": [{"role": "user", "content": prompt}],
+                "max_tokens": 8000,
+                "temperature": 0.1
             }>
 
             <cfhttp url="https://api.aillm.ru/v1/chat/completions" method="POST" timeout="120">
@@ -97,8 +97,19 @@
 
                 <!--- Вытаскиваем JSON из ответа --->
                 <cfset jsonText = llmText>
-                <cfif find("```json", jsonText)>
-                    <cfset jsonText = listLast(listFirst(jsonText, "```"), "```json")>
+                <cfset p1 = find("```json", jsonText)>
+                <cfif p1 GT 0>
+                    <cfset jsonText = mid(jsonText, p1 + 7, len(jsonText))>
+                    <cfset p2 = find("```", jsonText)>
+                    <cfif p2 GT 0>
+                        <cfset jsonText = left(jsonText, p2 - 1)>
+                    </cfif>
+                <cfelse>
+                    <cfset p1 = find("{", jsonText)>
+                    <cfset p2 = find("}", reverse(jsonText))>
+                    <cfif p1 GT 0 AND p2 GT 0>
+                        <cfset jsonText = mid(jsonText, p1, len(jsonText) - p2 - p1 + 2)>
+                    </cfif>
                 </cfif>
                 <cfset jsonText = trim(jsonText)>
 
@@ -117,16 +128,23 @@
                     <cfset savedRows = []>
                     <cfloop array="#rows#" index="row">
                         <cftry>
+                            <cfset rn = structKeyExists(row, 'row_num') ? row.row_num : 0>
+                            <cfset nm = structKeyExists(row, 'name') ? row.name : ''>
+                            <cfset pr = (structKeyExists(row, 'price') AND len(row.price)) ? row.price : ''>
+                            <cfset qt = (structKeyExists(row, 'qty') AND len(row.qty)) ? row.qty : ''>
+                            <cfset sm = (structKeyExists(row, 'sum') AND len(row.sum)) ? row.sum : ''>
+                            <cfset ds = (structKeyExists(row, 'date_start') AND len(row.date_start)) ? row.date_start : ''>
+
                             <cfquery datasource="baza">
                                 INSERT INTO spec_rows (supplement_id, row_num, name, price, qty, sum, date_start)
                                 VALUES (
                                     <cfqueryparam value="#sup.id#" cfsqltype="cf_sql_varchar">,
-                                    <cfqueryparam value="#structKeyExists(row, 'row_num') ? row.row_num : 0#" cfsqltype="cf_sql_integer">,
-                                    <cfqueryparam value="#structKeyExists(row, 'name') ? row.name : ''#" cfsqltype="cf_sql_varchar">,
-                                    <cfqueryparam value="#structKeyExists(row, 'price') AND NOT isNull(row.price) ? row.price : ''#" cfsqltype="cf_sql_float" null="#NOT structKeyExists(row, 'price') OR isNull(row.price)#">,
-                                    <cfqueryparam value="#structKeyExists(row, 'qty') AND NOT isNull(row.qty) ? row.qty : ''#" cfsqltype="cf_sql_float" null="#NOT structKeyExists(row, 'qty') OR isNull(row.qty)#">,
-                                    <cfqueryparam value="#structKeyExists(row, 'sum') AND NOT isNull(row.sum) ? row.sum : ''#" cfsqltype="cf_sql_float" null="#NOT structKeyExists(row, 'sum') OR isNull(row.sum)#">,
-                                    <cfqueryparam value="#structKeyExists(row, 'date_start') AND NOT isNull(row.date_start) ? row.date_start : ''#" cfsqltype="cf_sql_varchar" null="#NOT structKeyExists(row, 'date_start') OR isNull(row.date_start)#">
+                                    <cfqueryparam value="#rn#" cfsqltype="cf_sql_integer">,
+                                    <cfqueryparam value="#nm#" cfsqltype="cf_sql_varchar">,
+                                    <cfqueryparam value="#pr#" cfsqltype="cf_sql_float" null="#len(pr) EQ 0#">,
+                                    <cfqueryparam value="#qt#" cfsqltype="cf_sql_float" null="#len(qt) EQ 0#">,
+                                    <cfqueryparam value="#sm#" cfsqltype="cf_sql_float" null="#len(sm) EQ 0#">,
+                                    <cfqueryparam value="#ds#" cfsqltype="cf_sql_varchar" null="#len(ds) EQ 0#">
                                 )
                             </cfquery>
                             <cfset arrayAppend(savedRows, row)>
diff --git a/index.cfm b/index.cfm
index cb9c778..c3a5a00 100644
--- a/index.cfm
+++ b/index.cfm
@@ -1 +1 @@
-<cfsetting showdebugoutput=no enablecfoutputonly=yes><cfoutput>OK v1.0.8</cfoutput>
+<cfsetting showdebugoutput=no enablecfoutputonly=yes><cfoutput>OK v1.0.9</cfoutput>