From 91e8b21d3915d0cccf37853bfdf0e4faeb66d661 Mon Sep 17 00:00:00 2001 From: Igor I Date: Wed, 14 Aug 2024 16:50:44 +0500 Subject: [PATCH] =?UTF-8?q?i++=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B2?= =?UTF-8?q?=D0=B8=D0=B4=D1=83=D0=BB=20=D0=B2=D1=8B=D1=88=D0=B5=20=D0=B0=20?= =?UTF-8?q?=D1=82=D0=BE=20=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=B6=D0=B0?= =?UTF-8?q?=D1=82=D0=B8=D0=B8=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D0=BA=D1=83=20=D0=BF=D1=80=D0=BE=D0=B8=D1=81=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=D0=B8=D0=BB=D0=B0=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metadata/dbms/DBMSRecords.java | 2 +- metadata/dbms/dbms.xyz | 4 ++-- metadata/dbms/editrecord.js | 8 ++++---- metadata/dbms/records.xyz | 2 +- metadata/dbms/showrecord.js | 9 +++++---- metadata/dbms/window.js | 2 +- metadata/include/mpdf-6.1/CHANGELOG.txt | 2 +- metadata/test.xyz | 4 ++-- metadata/update/get.php | 2 +- metadata/update/reports.xml | 4 ++-- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/metadata/dbms/DBMSRecords.java b/metadata/dbms/DBMSRecords.java index 29f37e7..8c58c6c 100644 --- a/metadata/dbms/DBMSRecords.java +++ b/metadata/dbms/DBMSRecords.java @@ -1716,7 +1716,7 @@ public class DBMSRecords implements ServletContextAware { Object exprResult = expr.evaluate(nTypeS, XPathConstants.NODESET); nodeList = (NodeList) exprResult; for (int i = 0; i < nodeList.getLength(); i++) { - writer.write("" + trts(conn,nodeList.item(i).getAttributes().getNamedItem("d").getNodeValue(),user) + writer.write("" + trts(conn,nodeList.item(i).getAttributes().getNamedItem("d").getNodeValue(),user) + ""); } writer.write(" \n"); diff --git a/metadata/dbms/dbms.xyz b/metadata/dbms/dbms.xyz index dd490fb..23bf963 100644 --- a/metadata/dbms/dbms.xyz +++ b/metadata/dbms/dbms.xyz @@ -1247,12 +1247,12 @@ fwrite($fh, ' '.findNode($currNode,'objects-list')->getAttribute("d").''."\n"); fwrite($fh, ' '."\n"); fwrite($fh, ' '); - fwrite($fh, '№'); + fwrite($fh, '№'); $nextnode=findNode($currNode,'objects-list')->firstChild; $col=0; while ($nextnode) { if ($nextnode->nodeName=='column') - { fwrite($fh, ''.$nextnode->getAttribute("d").""); + { fwrite($fh, ''.$nextnode->getAttribute("d").""); } $nextnode = $nextnode->nextSibling; } diff --git a/metadata/dbms/editrecord.js b/metadata/dbms/editrecord.js index e8808d2..ecdcc92 100644 --- a/metadata/dbms/editrecord.js +++ b/metadata/dbms/editrecord.js @@ -144,7 +144,7 @@ class EdtRec str+=' '; str+=' '; str+=' '; - str+=' '; + str+=' '; str+=' '; str+=' '; str+=' '; @@ -935,7 +935,7 @@ class EdtRec let win=new TWin(); win.BuildGUI(pageX-10,pageY-10); let str=` -
'+trt('Name')+''+trt('Value')+'
+
@@ -1168,7 +1168,7 @@ class EdtRec }else if(count>1) //Display the item selection window. { - let htmlString='
'; + let htmlString='
'; nodeProp=nodeType.firstChild; let i=0; while (nodeProp!=null) @@ -1182,7 +1182,7 @@ class EdtRec value=value.replace(/"/g, """); value=value.replace(/'/g, "\\'"); value=value.replace(/\n/g, " "); - htmlString+=''+"\n"; + htmlString+=''+"\n"; i++; } nodeProp=nodeProp.nextSibling; diff --git a/metadata/dbms/records.xyz b/metadata/dbms/records.xyz index 8231ed0..2c59a6e 100644 --- a/metadata/dbms/records.xyz +++ b/metadata/dbms/records.xyz @@ -1252,7 +1252,7 @@ $col=0; while ($nextnode) { if ($nextnode->nodeName=='column') - { fwrite($fh, '"); + { fwrite($fh, '"); } $nextnode = $nextnode->nextSibling; } diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js index 16db494..5aeb2f4 100644 --- a/metadata/dbms/showrecord.js +++ b/metadata/dbms/showrecord.js @@ -360,7 +360,8 @@ class SRec id=nodeProp.getAttribute("id"); value=getCdataValue(nodeProp); value=value.replace(/"/g, """); value=value.replace(/'/g, "\\'"); - htmlString+=''+"\n"; + + htmlString+=''+"\n"; i++; } nodeProp=nodeProp.nextSibling; @@ -1296,9 +1297,9 @@ class SRec }; //when you click on a cell, the sent filter is prefilled with variables in accordance with the id of the pressed line //in the function we pass the cell id and the column number - td.onclick=function(obj,val1,val2){ + td.onclick=function(thiz,val1,val2){ return function(){ - obj.callWindow(val1,val2); + thiz.callWindow(val1,val2); } }(this,id,colN); }else @@ -1453,10 +1454,10 @@ class SRec { if(nodeCol.nodeName=="column") { + i++; if(nodeCol.getAttribute("n")==name){ break; } - i++; } nodeCol = nodeCol.nextSibling; } diff --git a/metadata/dbms/window.js b/metadata/dbms/window.js index b9a6034..16e7089 100644 --- a/metadata/dbms/window.js +++ b/metadata/dbms/window.js @@ -120,7 +120,7 @@ class TWin hd+='
'+findFirstNode(nodeProp, '#cdata-section').nodeValue+'
'+findFirstNode(nodeProp, '#cdata-section').nodeValue+'
'.$nextnode->getAttribute("d")."'.$nextnode->getAttribute("d")."
'+findFirstNode(nodeProp, '#cdata-section').nodeValue+' 
'+findFirstNode(nodeProp, '#cdata-section').nodeValue+' 
'; hd+=' '; hd+=' '; - hd+=' '; + hd+=' '; hd+=' '; //hd+=' '; hd+=' '; diff --git a/metadata/include/mpdf-6.1/CHANGELOG.txt b/metadata/include/mpdf-6.1/CHANGELOG.txt index a2e0140..dd75ab7 100644 --- a/metadata/include/mpdf-6.1/CHANGELOG.txt +++ b/metadata/include/mpdf-6.1/CHANGELOG.txt @@ -322,7 +322,7 @@ Bidi override codes supported - Right-to-Left Embedding [RLE] U+202B, Left-to-Ri U+202C POP DIRECTIONAL FORMATTING (PDF) Support for in HTML - uses it to SetBasePath for relative URLs. HTML tag - added support for or - converted to a soft-hyphen -CSS now takes precedence over HTML attribute e.g.
 
+CSS now takes precedence over HTML attribute e.g.
diff --git a/metadata/test.xyz b/metadata/test.xyz index ee0bcc7..0834b22 100644 --- a/metadata/test.xyz +++ b/metadata/test.xyz @@ -13,13 +13,13 @@
- + - + diff --git a/metadata/update/get.php b/metadata/update/get.php index 10dbb6a..227fe4b 100644 --- a/metadata/update/get.php +++ b/metadata/update/get.php @@ -3,7 +3,7 @@ Синхронизация - + +
trt('Name') trt('Value')
trt('Name') trt('Value')
- +
ПАСПОРТНЫЕ ДАННЫЕ