From 3563d9b37ebb3a59dd4d5ed1d82882818fd5d1ea Mon Sep 17 00:00:00 2001
From: bzg1107 <preloyalwhite@163.com>
Date: Wed, 28 Jul 2021 16:11:33 +0800
Subject: [PATCH] nexus fix version and nxtranslate xml

---
 CMakeLists.txt                                          | 2 --
 applications/NXtranslate/text_xml/xml_retriever_dom.cpp | 8 ++++----
 applications/NXtranslate/xml_parser.cpp                 | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c50538..8f8b0bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,6 @@ endif()
 #-----------------------------------------------------------------------------
 set (API_VERSION_MAJOR 4)
 set (API_VERSION_MINOR 4)
-set (API_VERSION_PATCH 2)
 set (API_VERSION "${API_VERSION_MAJOR}.${API_VERSION_MINOR}.${API_VERSION_PATCH}")
 set (ABI_CURRENT 1)
 set (ABI_REVISION 0)
@@ -78,7 +77,6 @@ set (ABI_VERSION "${ABI_CURRENT}.${ABI_REVISION}.${ABI_AGE}")
 
 set (NEXUS_VERSION_MAJOR 4)
 set (NEXUS_VERSION_MINOR 4)
-set (NEXUS_VERSION_PATCH 2)
 set (NEXUS_SONAME 4)
 set (NAPI_VERSION "${NEXUS_VERSION_MAJOR}.${NEXUS_VERSION_MINOR}.${NEXUS_VERSION_PATCH}")
 set (NXLTVERSINFO "${NEXUS_VERSION_MAJOR}:${NEXUS_VERSION_MINOR}:${NEXUS_VERSION_PATCH}")
diff --git a/applications/NXtranslate/text_xml/xml_retriever_dom.cpp b/applications/NXtranslate/text_xml/xml_retriever_dom.cpp
index dcc56f4..dad5403 100644
--- a/applications/NXtranslate/text_xml/xml_retriever_dom.cpp
+++ b/applications/NXtranslate/text_xml/xml_retriever_dom.cpp
@@ -163,8 +163,8 @@ static void my_error(void *user_data, const char* msg, ...){
   va_start(args,msg);
 
   // get the position of the error
-  int line=getLineNumber(context);
-  int col =getColumnNumber(context);
+  int line=xmlSAX2GetLineNumber(context);
+  int col =xmlSAX2GetColumnNumber(context);
 
   // print out the result
   char str[70];
@@ -186,8 +186,8 @@ static void my_fatalError(void *user_data, const char* msg, ...){
   va_start(args,msg);
 
   // get the position of the error
-  int line=getLineNumber(context);
-  int col =getColumnNumber(context);
+  int line=xmlSAX2GetLineNumber(context);
+  int col =xmlSAX2GetColumnNumber(context);
 
   // print out the result
   char str[70];
diff --git a/applications/NXtranslate/xml_parser.cpp b/applications/NXtranslate/xml_parser.cpp
index 70500a1..7457180 100644
--- a/applications/NXtranslate/xml_parser.cpp
+++ b/applications/NXtranslate/xml_parser.cpp
@@ -463,8 +463,8 @@ static void my_error(void *user_data, const char* msg, ...){
   va_start(args,msg);
 
   // get the position of the error
-  int line=getLineNumber(context);
-  int col =getColumnNumber(context);
+  int line=xmlSAX2GetLineNumber(context);
+  int col =xmlSAX2GetColumnNumber(context);
 
   // print out the result
   char str[70];
@@ -486,8 +486,8 @@ static void my_fatalError(void *user_data, const char* msg, ...){
   va_start(args,msg);
 
   // get the position of the error
-  int line=getLineNumber(context);
-  int col =getColumnNumber(context);
+  int line=xmlSAX2GetLineNumber(context);
+  int col =xmlSAX2GetColumnNumber(context);
 
   // print out the result
   char str[70];
-- 
2.30.0