From: APTX <marek321@gmail.com>
Date: Sat, 7 Apr 2012 16:04:27 +0000 (-0400)
Subject: Proper xalan fix
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=0de423b7a62d1f7a8d1aa4cebcf06ac2d6f351e2;p=libferris.git

Proper xalan fix
---

diff --git a/xsltfunctions/xslt_ferris.cpp b/xsltfunctions/xslt_ferris.cpp
index 4d58d6a..fad3ed5 100644
--- a/xsltfunctions/xslt_ferris.cpp
+++ b/xsltfunctions/xslt_ferris.cpp
@@ -69,7 +69,7 @@ namespace FerrisXSLT
                     if (args.size() < 3 )
                     {
                         XalanDOMString buf;
-                        executionContext;//error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -98,7 +98,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -151,7 +151,7 @@ namespace FerrisXSLT
                     if (args.size() < 3 )
                     {
                         XalanDOMString buf;
-                        executionContext;//error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -183,7 +183,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -238,7 +238,7 @@ namespace FerrisXSLT
                     if (args.size() < 3 )
                     {
                         XalanDOMString buf;
-                        executionContext;//error( getError( buf ), context );
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -265,7 +265,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
                 
             }
@@ -319,7 +319,7 @@ namespace FerrisXSLT
                     if (args.size() < 1 )
                     {
                         XalanDOMString buf;
-                        executionContext;//error( getError( buf ), context );
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
 
@@ -334,7 +334,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -391,7 +391,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -447,7 +447,7 @@ namespace FerrisXSLT
                     if (args.size() < 2 )
                     {
                         XalanDOMString buf;
-                        executionContext;//error( getError( buf ), context );
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -505,7 +505,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -574,7 +574,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -643,7 +643,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -709,7 +709,7 @@ namespace FerrisXSLT
                     if (args.size() != 1 )
                     {
                         XalanDOMString buf;
-                        executionContext;//error( getError( buf ), context );
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
 
@@ -719,7 +719,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
diff --git a/xsltfunctions/xslt_fs.cpp b/xsltfunctions/xslt_fs.cpp
index b4b6328..b0ce883 100644
--- a/xsltfunctions/xslt_fs.cpp
+++ b/xsltfunctions/xslt_fs.cpp
@@ -81,7 +81,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context);
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
diff --git a/xsltfunctions/xslt_shell.cpp b/xsltfunctions/xslt_shell.cpp
index e55d356..6d24b36 100644
--- a/xsltfunctions/xslt_shell.cpp
+++ b/xsltfunctions/xslt_shell.cpp
@@ -73,7 +73,7 @@ namespace FerrisXSLT
                     if (args.size() != 1)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
 
@@ -83,7 +83,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -139,7 +139,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -195,7 +195,7 @@ namespace FerrisXSLT
                     if (args.size() != 1)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
 
@@ -208,7 +208,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -264,7 +264,7 @@ namespace FerrisXSLT
                     if (args.size() != 2)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -339,7 +339,7 @@ namespace FerrisXSLT
                         cerr << "create-dir wrong args size" << endl;
                     
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     cerr << "create-dir2 args.sz:" << args.size() << endl;
                 
@@ -362,7 +362,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
                 
             }
@@ -419,7 +419,7 @@ namespace FerrisXSLT
                     if (args.size() != 2 )
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                 
                     assert( !args[0].null() );
@@ -435,7 +435,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -490,7 +490,7 @@ namespace FerrisXSLT
                     if (args.size() != 1 )
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                 
                     assert( !args[0].null() );
@@ -501,7 +501,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -558,7 +558,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -613,7 +613,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -669,7 +669,7 @@ namespace FerrisXSLT
                     if (args.size() != 1 )
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                 
                     assert( !args[0].null() );
@@ -680,7 +680,7 @@ namespace FerrisXSLT
                 }
                 catch( std::exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
                 
             }
@@ -739,7 +739,7 @@ namespace FerrisXSLT
                     if (args.size() != 3 )
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                 
                     assert( !args[0].null() );
@@ -766,7 +766,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                        executionContext;//.error( domstr(e.what()), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -822,7 +822,7 @@ namespace FerrisXSLT
                     if (args.size() != 3 )
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                 
                     assert( !args[0].null() );
@@ -873,7 +873,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//.error( domstr(e.what()), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
@@ -929,7 +929,7 @@ namespace FerrisXSLT
                     if (args.size() != 2 )
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                 
                     assert( !args[0].null() );
@@ -945,7 +945,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                        executionContext;//.error( domstr(e.what()), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr(e.what()), locator, context );
                 }
             }
 
diff --git a/xsltfunctions/xslt_string.cpp b/xsltfunctions/xslt_string.cpp
index fab4fdd..7625ec4 100644
--- a/xsltfunctions/xslt_string.cpp
+++ b/xsltfunctions/xslt_string.cpp
@@ -73,7 +73,7 @@ namespace FerrisXSLT
                     if (args.size() != 2)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -92,7 +92,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//.error( domstr( e.what() ), context);
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr( e.what() ), locator, context );
                 }
             }
 
@@ -148,7 +148,7 @@ namespace FerrisXSLT
                     if (args.size() != 2)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -165,7 +165,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//.error( domstr( e.what() ), context);
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr( e.what() ), locator, context );
                 }
             }
 
@@ -220,7 +220,7 @@ namespace FerrisXSLT
                     if (args.size() != 3)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
                     assert( !args[1].null() );
@@ -233,7 +233,7 @@ namespace FerrisXSLT
                     if( oldv.empty() || newv.empty() )
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     
                     replace_if( str.begin(), str.end(),
@@ -247,7 +247,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//.error( domstr( e.what() ), context);
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr( e.what() ), locator, context );
                 }
             }
 
@@ -302,7 +302,7 @@ namespace FerrisXSLT
                     if (args.size() != 1)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
                     assert( !args[0].null() );
 
@@ -319,7 +319,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//.error( domstr( e.what() ), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr( e.what() ), locator, context );
                 }
             }
 
@@ -382,7 +382,7 @@ namespace FerrisXSLT
                     if (args.size() != 0)
                     {
                         XalanDOMString buf;
-                        executionContext;//.error( getError( buf ), context);
+                        executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, getError( buf ), locator, context );
                     }
 
                     ++Counter;
@@ -392,7 +392,7 @@ namespace FerrisXSLT
                 }
                 catch( exception& e )
                 {
-                    executionContext;//.error( domstr( e.what() ), context );
+                    executionContext.problem( XPathExecutionContext::eXPath, XPathExecutionContext::eError, domstr( e.what() ), locator, context );
                 }
             }