Move pgScript output prefixes to constants, instead of being embedded

in all strings. Also make the error messages (but not the prefixes) translatable. Mickael Deloison with some surgery from me git-svn-id: svn://svn.pgadmin.org/trunk@7664 a7884b65-44f6-0310-8a51-81a127f17b15
pgadmin-org · Mar 10, 2009 · 6ab4d6b · 6ab4d6b
1 parent e6ab859
commit 6ab4d6b
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 16 deletions.
diff --git a/pgadmin/include/pgscript/pgScript.h b/pgadmin/include/pgscript/pgScript.h
@@ -28,6 +28,12 @@ typedef unsigned short int USHORT;
 #include <wx/txtstrm.h>
 #define pgsOutputStream wxTextOutputStream
 
+const wxString PGSOUTPGSCRIPT (wxT("[PGSCRIPT ] "));
+const wxString PGSOUTEXCEPTION(wxT("[EXCEPTION] "));
+const wxString PGSOUTQUERY    (wxT("[QUERY    ] "));
+const wxString PGSOUTWARNING  (wxT("[WARNING  ] "));
+const wxString PGSOUTERROR    (wxT("[ERROR    ] "));
+
 /*** LOGGING ***/
 
 #include "utils/sysLogger.h"

diff --git a/pgadmin/include/utils/misc.h b/pgadmin/include/utils/misc.h
@@ -100,6 +100,8 @@ wxLongLong StrToLongLong(const wxString& value);
 wxDateTime StrToDateTime(const wxString &value);
 OID StrToOid(const wxString& value);
 
+wxString generate_spaces(int length);
+
 // nls aware
 wxString BoolToYesNo(bool value);
 wxString NumToStr(long value);

diff --git a/pgadmin/pgscript/exceptions/pgsArithmeticException.cpp b/pgadmin/pgscript/exceptions/pgsArithmeticException.cpp
@@ -24,6 +24,7 @@ pgsArithmeticException::~pgsArithmeticException()
 
 const wxString pgsArithmeticException::message() const
 {
-	return wxString() << wxT("[EXCEPT] Arithmetic Exception - Operation impossible between ")
-			<< m_left << wxT(" and ") << m_right;
+	return wxString() << PGSOUTEXCEPTION <<
+		wxString::Format(_("Arithmetic Exception - Operation impossible between '%s' and '%s'"),
+			m_left.c_str(), m_right.c_str());
 }
diff --git a/pgadmin/pgscript/exceptions/pgsAssertException.cpp b/pgadmin/pgscript/exceptions/pgsAssertException.cpp
@@ -24,5 +24,5 @@ pgsAssertException::~pgsAssertException()
 
 const wxString pgsAssertException::message() const
 {
-	return wxString() << wxT("[EXCEPT] Assert Exception - ") << m_message;
+	return wxString() << PGSOUTEXCEPTION << _("Assert Exception - ") << m_message;
 }
diff --git a/pgadmin/pgscript/exceptions/pgsCastException.cpp b/pgadmin/pgscript/exceptions/pgsCastException.cpp
@@ -24,6 +24,7 @@ pgsCastException::~pgsCastException()
 
 const wxString pgsCastException::message() const
 {
-	return wxString() << wxT("[EXCEPT] Cast Exception - Cannot convert ")
-			<< m_value << wxT(" to ") << m_type;
+	return wxString() << PGSOUTEXCEPTION << 
+			wxString::Format(_("Cast Exception - Cannot convert '%s' to '%s'"),
+							 m_value.c_str(), m_type.c_str());
 }
diff --git a/pgadmin/pgscript/exceptions/pgsInterruptException.cpp b/pgadmin/pgscript/exceptions/pgsInterruptException.cpp
@@ -24,5 +24,5 @@ pgsInterruptException::~pgsInterruptException()
 
 const wxString pgsInterruptException::message() const
 {
-	return wxT("[EXCEPT] pgScript interrupted");
+	return wxString() << PGSOUTEXCEPTION << _("pgScript interrupted");
 }
diff --git a/pgadmin/pgscript/exceptions/pgsParameterException.cpp b/pgadmin/pgscript/exceptions/pgsParameterException.cpp
@@ -9,6 +9,7 @@
 
 
 #include "pgAdmin3.h"
+#include "utils/misc.h"
 #include "pgscript/exceptions/pgsParameterException.h"
 
 pgsParameterException::pgsParameterException(const wxString & message) :
@@ -25,7 +26,10 @@ pgsParameterException::~pgsParameterException()
 const wxString pgsParameterException::message() const
 {
 	wxString message(m_message);
-	message.Replace(wxT("\n"), wxT("\n         "));
-	return wxString() << wxT("[EXCEPT] Parameter Exception - Some parameters ")
-			<< wxT("are invalid:\n>> ") << message;
+	message.Replace(wxT("\n"), wxT("\n") + generate_spaces(PGSOUTEXCEPTION.Length()));
+	message.Prepend(wxT(">> "));
+	message.Prepend(generate_spaces(PGSOUTEXCEPTION.Length()));
+	return wxString() << PGSOUTEXCEPTION <<
+			wxString::Format(_("Parameter Exception - Some parameters are invalid:\n>> %s"),
+				message.c_str());
 }
diff --git a/pgadmin/pgscript/expressions/pgsExecute.cpp b/pgadmin/pgscript/expressions/pgsExecute.cpp
@@ -116,12 +116,13 @@ pgsOperand pgsExecute::eval(pgsVarMap & vars) const
 					{
 						m_app->LockOutput();
 
-						(*m_cout) << wxT("[WRNING] ");
+						(*m_cout) << PGSOUTWARNING;
 						wxString message(stmt + wxT("\n") + thread
 								.GetMessagesAndClear().Strip(wxString::both));
 						wxRegEx multilf(wxT("(\n)+"));
 						multilf.ReplaceAll(&message, wxT("\n"));
-						message.Replace(wxT("\n"), wxT("\n         "));
+						message.Replace(wxT("\n"), wxT("\n")
+								+ generate_spaces(PGSOUTWARNING.Length() + 1));
 						(*m_cout) << message << wxT("\n");
 
 						m_app->UnlockOutput();
@@ -133,7 +134,7 @@ pgsOperand pgsExecute::eval(pgsVarMap & vars) const
 					{
 						m_app->LockOutput();
 
-						(*m_cout) << wxT("[NOTICE] ");
+						(*m_cout) << PGSOUTQUERY;
 						wxString message(thread.GetMessagesAndClear()
 								.Strip(wxString::both));
 						if (!message.IsEmpty())
@@ -142,7 +143,8 @@ pgsOperand pgsExecute::eval(pgsVarMap & vars) const
 							message = stmt;
 						wxRegEx multilf(wxT("(\n)+"));
 						multilf.ReplaceAll(&message, wxT("\n"));
-						message.Replace(wxT("\n"), wxT("\n         "));
+						message.Replace(wxT("\n"), wxT("\n")
+								+ generate_spaces(PGSOUTQUERY.Length() + 1));
 						(*m_cout) << message << wxT("\n");
 
 						m_app->UnlockOutput();

diff --git a/pgadmin/pgscript/statements/pgsPrintStmt.cpp b/pgadmin/pgscript/statements/pgsPrintStmt.cpp
@@ -11,6 +11,7 @@
 #include "pgAdmin3.h"
 #include "pgscript/statements/pgsPrintStmt.h"
 
+#include "pgscript/exceptions/pgsException.h"
 #include "pgscript/utilities/pgsThread.h"
 #include "pgscript/utilities/pgsUtilities.h"
 
@@ -33,8 +34,20 @@ void pgsPrintStmt::eval(pgsVarMap & vars) const
 		m_app->LockOutput();
 	}
 
-	m_cout << wxT("[OUTPUT] ") << wx_static_cast(const wxString,
-			m_var->eval(vars)->value()) << wxT("\n");
+	try
+	{
+		m_cout << PGSOUTPGSCRIPT << wx_static_cast(const wxString,
+				m_var->eval(vars)->value()) << wxT("\n");
+	}
+	catch (const pgsException &)
+	{
+		if (m_app != 0)
+		{
+			m_app->UnlockOutput();
+		}
+
+		throw;
+	}
 
 	if (m_app != 0)
 	{

diff --git a/pgadmin/pgscript/statements/pgsStmtList.cpp b/pgadmin/pgscript/statements/pgsStmtList.cpp
@@ -82,7 +82,7 @@ void pgsStmtList::eval(pgsVarMap & vars) const
 					m_app->LockOutput();
 				}
 
-				m_cout << wxT("[ERROR] Unknown exception:\n")
+				m_cout << PGSOUTERROR << _("Unknown exception:\n")
 						<< wx_static_cast(const wxString,
 								wxString(e.what(), wxConvUTF8));
 				m_exception_thrown = true;

diff --git a/pgadmin/utils/misc.cpp b/pgadmin/utils/misc.cpp
@@ -132,6 +132,10 @@ OID StrToOid(const wxString& value)
     return (OID)strtoul(value.ToAscii(), 0, 10);
 }
 
+wxString generate_spaces(int length)
+{
+	return wxString().Pad(length);
+}
 
 wxString NumToStr(double value)
 {