X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdbms%2FSentence.cpp;h=5ab68be5f7aac6da686630e12614e546d0e8d312;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=48b2e2149bac6b07049f47ae40f4e6db2e704046;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/dbms/Sentence.cpp b/source/dbms/Sentence.cpp index 48b2e21..5ab68be 100644 --- a/source/dbms/Sentence.cpp +++ b/source/dbms/Sentence.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of the copyright holder nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -46,13 +18,13 @@ using namespace std; using namespace anna; const string& dbms::Sentence::getName() const -throw() { +{ static string empty; return (a_dbStatement == NULL) ? empty : a_dbStatement->getName(); } void dbms::Sentence::initialize(dbms::Database& database) -throw(RuntimeException) { +noexcept(false) { Guard guard(this, "anna::dbms::Sentence (initialize)"); a_dbStatement = do_initialize(database); } @@ -62,7 +34,7 @@ throw(RuntimeException) { // activa externamente ... para recoger datos multiples, etc, etc. //------------------------------------------------------------------------------------- dbms::ResultCode dbms::Sentence::execute(dbms::Connection& connection, dbms::Statement* statement) -throw(RuntimeException) { +noexcept(false) { using namespace anna::dbms; ResultCode result; @@ -87,7 +59,7 @@ throw(RuntimeException) { } bool dbms::Sentence::fetch() -throw(RuntimeException) { +noexcept(false) { bool result = false; try { @@ -101,7 +73,7 @@ throw(RuntimeException) { string dbms::Sentence::asString() const /*virtual*/ -throw() { +{ string result("dbms::Sentence { Mode: "); result += (a_mode == Mode::SilentWhenNotFound) ? "SilentWhenNotFound" : "ExceptionWhenNotFound"; result += " | "; @@ -116,7 +88,7 @@ throw() { /*virtual*/ xml::Node* dbms::Sentence::asXML(xml::Node* parent) const -throw() { +{ xml::Node* result = parent->createChild("dbms.Sentence"); result->createAttribute("Mode", (a_mode == Mode::SilentWhenNotFound) ? "SilentWhenNotFound" : "ExceptionWhenNotFound");