X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fhttp%2Fwims20%2FServerSide.cpp;h=0e70bd8b53e4db0476eb3054a678a1c22f5c7229;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=ee04ea6bcc0640527dbaf31972769abbb9ea4b69;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/http/wims20/ServerSide.cpp b/source/http/wims20/ServerSide.cpp index ee04ea6..0e70bd8 100644 --- a/source/http/wims20/ServerSide.cpp +++ b/source/http/wims20/ServerSide.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 @@ -50,7 +22,7 @@ using namespace anna; * expresión con la forma: http://xxx/zzzzAAAAAA, p.e. */ void http::wims20::ServerSide::decode(const http::Request& request) -throw(RuntimeException) { +noexcept(false) { Abstract::clear(); const string& uri = request.getURI(); // Calcula la parte corta que hemos definido para el servicio @@ -114,7 +86,7 @@ throw(RuntimeException) { } const string* http::wims20::ServerSide::getValue(const char* name, const Exception::Mode::_v mode) const -throw(RuntimeException) { +noexcept(false) { const string* result = NULL; if(hasParameters() == true) { @@ -144,13 +116,13 @@ throw(RuntimeException) { } const char* http::wims20::ServerSide::getCStringValue(const char* name, const Exception::Mode::_v mode) const -throw(RuntimeException) { +noexcept(false) { const string* temp = getValue(name, mode); return (temp == NULL) ? NULL : temp->c_str(); } int http::wims20::ServerSide::getIntegerValue(const char* name, const Exception::Mode::_v mode) const -throw(RuntimeException) { +noexcept(false) { const string* tmp = getValue(name, mode); if(tmp == NULL) @@ -160,10 +132,10 @@ throw(RuntimeException) { return (anna_strncmp(value, "0x", 2) == 0) ? strtol(value + 2, NULL, 16) : atoi(value); } -/* Nos ha debido llegar algo así como: serviceID/guid/*{other_possible_levels} +/* Nos ha debido llegar algo asi como: serviceID/guid {other_possible_levels} */ void http::wims20::ServerSide::decodeHierarchy(const std::string& hierarchy) -throw(RuntimeException) { +noexcept(false) { const Tokenizer& items = split(SplitCode::HierarchyItem, hierarchy); Abstract::setServiceID(items [0]); Abstract::setGUID(items [1]); @@ -181,7 +153,7 @@ throw(RuntimeException) { /* Nos ha debido llegar algo así como: name=value&*{nameN=valueN} */ void http::wims20::ServerSide::decodeParameters(const std::string& parameters) -throw(RuntimeException) { +noexcept(false) { const Tokenizer& tkparams = split(SplitCode::Parameters, parameters); for(Tokenizer::const_iterator ii = tkparams.begin(), maxii = tkparams.end(); ii != maxii; ii ++) { @@ -193,7 +165,7 @@ throw(RuntimeException) { } const Tokenizer& http::wims20::ServerSide::split(const SplitCode::_v splitZone, const std::string& str) -throw(RuntimeException) { +noexcept(false) { static const char* separator [] = { "?", "/", "&", "=", NULL }; a_tokenizer [splitZone].apply(str, separator [splitZone]); LOGDEBUG(