+
This commit is contained in:
@ -433,7 +433,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
String xml = "";
|
String xml = "";
|
||||||
|
|
||||||
//Get XML node from database and parse to DOM
|
//Get XML node from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,name));
|
doc = parseString(getTypeStrNode2(name));
|
||||||
|
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
doc.getDocumentElement().normalize(); //Del or concat text node
|
doc.getDocumentElement().normalize(); //Del or concat text node
|
||||||
@ -611,7 +611,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
//doc.getDocumentElement().normalize(); //Del or concat text node
|
//doc.getDocumentElement().normalize(); //Del or concat text node
|
||||||
@ -726,7 +726,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
//doc.getDocumentElement().normalize(); //Del or concat text node
|
//doc.getDocumentElement().normalize(); //Del or concat text node
|
||||||
@ -834,7 +834,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
//doc.getDocumentElement().normalize(); //Del or concat text node
|
//doc.getDocumentElement().normalize(); //Del or concat text node
|
||||||
@ -921,7 +921,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
//Find XML node "type" by name
|
//Find XML node "type" by name
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
@ -1184,7 +1184,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
//doc.getDocumentElement().normalize(); //Del or concat text node
|
//doc.getDocumentElement().normalize(); //Del or concat text node
|
||||||
@ -1285,7 +1285,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
//Находим серверный XML узел по имени
|
//Находим серверный XML узел по имени
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
@ -1546,7 +1546,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
|
|
||||||
String typename = "_Login";
|
String typename = "_Login";
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
//Находим серверный XML узел по имени
|
//Находим серверный XML узел по имени
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
@ -1769,7 +1769,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Get XML node "type" from database and parse to DOM
|
//Get XML node "type" from database and parse to DOM
|
||||||
doc = parseString(getTypeStrNode(conn,typename));
|
doc = parseString(getTypeStrNode2(typename));
|
||||||
|
|
||||||
//Находим серверный XML узел по имени
|
//Находим серверный XML узел по имени
|
||||||
if (doc != null) {
|
if (doc != null) {
|
||||||
@ -2353,7 +2353,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
|
|
||||||
public static String getRandomString(int length) {
|
public static String getRandomString(int length) {
|
||||||
final String characters = "abcdefghijklmnopqrstuvwxyz1234567890";
|
final String characters = "abcdefghijklmnopqrstuvwxyz1234567890";
|
||||||
StringBuilder result = new StringBuilder();
|
StringBuilder result = new StringBuilder(1024);
|
||||||
while (length > 0) {
|
while (length > 0) {
|
||||||
Random rand = new Random();
|
Random rand = new Random();
|
||||||
result.append(characters.charAt(rand.nextInt(characters.length())));
|
result.append(characters.charAt(rand.nextInt(characters.length())));
|
||||||
@ -2457,7 +2457,7 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
|
|
||||||
//Получить узел метаданных из базы данных (новая функция ниже)
|
//Получить узел метаданных из базы данных (новая функция ниже)
|
||||||
//TODO потом удалить
|
//TODO потом удалить
|
||||||
public String getTypeStrNode(Connection conn,String typeName)
|
/*public String getTypeStrNode(Connection conn,String typeName)
|
||||||
{
|
{
|
||||||
String result="";
|
String result="";
|
||||||
String sql="select xml from main._metadata where name='"+typeName+"';";
|
String sql="select xml from main._metadata where name='"+typeName+"';";
|
||||||
@ -2486,8 +2486,8 @@ public class DBMSRecords implements ServletContextAware {
|
|||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}*/
|
||||||
//Получить узел метаданных из базы данных (новая функция ниже)
|
//Получить узел метаданных из базы данных
|
||||||
public String getTypeStrNode2(String typeName)
|
public String getTypeStrNode2(String typeName)
|
||||||
{
|
{
|
||||||
String result="";
|
String result="";
|
||||||
|
|||||||
Reference in New Issue
Block a user