From 520d3e36e7d0d185d46e44087d3f32647714ccba Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 17 Jan 2018 00:02:48 +0300
Subject: testxml: add support for non ascii chars in error messages.

---
 testxml/testxml.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/testxml/testxml.py b/testxml/testxml.py
index d62d1f4..c96b8a8 100755
--- a/testxml/testxml.py
+++ b/testxml/testxml.py
@@ -63,18 +63,24 @@ class Layer:
 
 def printErr(err):
     errDict.add(err)
-    print err
+    print err.encode("utf-8")
 
 def showFileErrorById(id, rootDir, fileDir):
+    rootDir = rootDir.encode("utf-8")
+    fileDir = fileDir.encode("utf-8")
     print "error: id=" + id + ", file not found: " + fileDir + " (" + rootDir + fileDir + ")"
 
 def showFileWarningById(id, rootDir, fileDir):
+    rootDir = rootDir.encode("utf-8")
+    fileDir = fileDir.encode("utf-8")
     print "warn: id=" + id + ", file not found: " + fileDir + " (" + rootDir + fileDir + ")"
 
 def showError(id, text):
+    text = text.encode("utf-8")
     print "error: id=" + id + " " + text
 
 def showWarning(id, text):
+    text = text.encode("utf-8")
     print "warn: id=" + id + " " + text
 
 def showMsg(id, text, src, iserr):
-- 
cgit v1.2.3-60-g2f50


From d1f7f2b26bf49bedf953aead034aa050a61c20e3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 8 Feb 2018 20:26:55 +0300
Subject: Add db update to version 11.

---
 localserver/initdb.sh   | 2 +-
 localserver/updatedb.sh | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/localserver/initdb.sh b/localserver/initdb.sh
index 9c81fed..417bc1a 100755
--- a/localserver/initdb.sh
+++ b/localserver/initdb.sh
@@ -22,5 +22,5 @@ $CMD <logs.sql
 
 if [[ -z "${VER}" ]]; then
     mkdir ${DIR}/versions
-    echo "10" >${DIR}/versions/sqlver
+    echo "11" >${DIR}/versions/sqlver
 fi
diff --git a/localserver/updatedb.sh b/localserver/updatedb.sh
index 0df8fd8..16080b7 100755
--- a/localserver/updatedb.sh
+++ b/localserver/updatedb.sh
@@ -54,6 +54,11 @@ if [ "${VER}" -lt "10" ]; then
     run "2017-11-04--10-39.sql"
 fi
 
-if [ "${VER}" -lt "10" ]; then
-    echo "10" >versions/sqlver
+if [ "${VER}" -lt "11" ]; then
+    run "2017-06-04--15-04.sql"
+    run "2017-06-04--15-05.sql"
+fi
+
+if [ "${VER}" -lt "11" ]; then
+    echo "11" >versions/sqlver
 fi
-- 
cgit v1.2.3-60-g2f50