From ec85845d9eb2f07ab66d328a448d3224f57bede1 Mon Sep 17 00:00:00 2001
From: Igor I <ivanov.i@istt.kz>
Date: Thu, 25 Jul 2024 21:38:14 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BE=D1=87=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata/dbms/DBMSRecords.java | 9 +++++----
 metadata/dbms/DBMSTree.java    | 6 +++---
 metadata/dbms/showrecord.js    | 4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/metadata/dbms/DBMSRecords.java b/metadata/dbms/DBMSRecords.java
index 59afb71..29f37e7 100644
--- a/metadata/dbms/DBMSRecords.java
+++ b/metadata/dbms/DBMSRecords.java
@@ -100,6 +100,11 @@ public class DBMSRecords implements ServletContextAware {
 		return new User("none");
 	}
 
+	@Override
+	public void setServletContext(ServletContext servletContext) {
+		this.context=servletContext;
+	}
+
 	public String sendError(int code, String message) {
 		JSONObject json = new JSONObject();
 		json.put("error_code",code);
@@ -2317,8 +2322,4 @@ public class DBMSRecords implements ServletContextAware {
 		return doc;
 	}
 
-	@Override
-	public void setServletContext(ServletContext servletContext) {
-		this.context=servletContext;
-	}
 }
\ No newline at end of file
diff --git a/metadata/dbms/DBMSTree.java b/metadata/dbms/DBMSTree.java
index d00dc0c..7b5b143 100644
--- a/metadata/dbms/DBMSTree.java
+++ b/metadata/dbms/DBMSTree.java
@@ -1,4 +1,4 @@
-package kz.goodssales.GoodsSales.dbms;
+package dbms;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -40,13 +40,13 @@ import org.w3c.dom.NodeList;
 
 import tctable.Tools;
 import tools.User;
-import tools.XMLTools;
+import tools.xml.XMLTools;
 
 @Controller
 @SessionAttributes( { "user" }) //Сесионный объект!
 public class DBMSTree implements ServletContextAware  {
 	
-	private static final Logger logger = LoggerFactory.getLogger(kz.goodssales.GoodsSales.dbms.DBMSTree.class);
+	private static final Logger logger = LoggerFactory.getLogger(DBMSTree.class);
 	private ServletContext context;
 
 	//If not created object "user", create him.
diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js
index 971a19e..16db494 100644
--- a/metadata/dbms/showrecord.js
+++ b/metadata/dbms/showrecord.js
@@ -1280,8 +1280,8 @@ class SRec
 					if(node.data[i].row[j]!=null) textNode=document.createTextNode(node.data[i].row[j]);
 					else textNode=document.createTextNode("");
 
-					//td.setAttribute("id",id+this.masCL[colN].getAttribute("n")); //so that you can identify each record when you update
-					td.setAttribute("id",id+this.masCL[colN].n); //so that you can identify each record when you update
+					td.setAttribute("id",id+this.masCL[colN].getAttribute("n")); //so that you can identify each record when you update
+					//td.setAttribute("id",id+this.masCL[colN].n); //so that you can identify each record when you update
 					td.appendChild(textNode);
 					//if in the metadata for this column there is a reference object then add a link
 					if (this.masCT[colN]!=null)