-// 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 //
// Local
trace += "\n";\
anna::Logger::notice(trace, ANNA_FILE_LOCATION);\
);\
+std::string name = found->getName();\
pool.erase(pool.find(found->getId()));\
-poolNames.erase(poolNames.find(found->getName()));
+poolNames.erase(poolNames.find(name));
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
//----------------------------------------------------- Dictionary::initialize()
//------------------------------------------------------------------------------
-void Dictionary::initialize() throw() {
+void Dictionary::initialize() {
a_formats.clear();
a_vendors.clear();
a_avps.clear();
//------------------------------------------------------------------------------
//------------------------------------------------------ Dictionary::addFormat()
//------------------------------------------------------------------------------
-void Dictionary::addFormat(const Format & format, bool reserved) throw(anna::RuntimeException) {
+void Dictionary::addFormat(const Format & format, bool reserved) noexcept(false) {
if(!reserved && format.isReserved()) {
std::string s_ex = anna::functions::asString("Format type '%s' is reserved for internal use", format.getName().c_str());
throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION);
//------------------------------------------------------------------------------
//------------------------------------------------------ Dictionary::addVendor()
//------------------------------------------------------------------------------
-void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException) {
+void Dictionary::addVendor(const Vendor & vendor) noexcept(false) {
const Vendor * found = getVendor(vendor.getId());
if(found) {
//------------------------------------------------------------------------------
//--------------------------------------------------------- Dictionary::addAvp()
//------------------------------------------------------------------------------
-void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) {
+void Dictionary::addAvp(const Avp & avp) noexcept(false) {
const Avp * found = getAvp(avp.getId());
if (found) {
ITEM_OVERWRITE("avp", avp, a_avps, a_avpNames);
}
- if(found = getAvp(avp.getName())) {
+ if((found = getAvp(avp.getName()))) {
if(!a_allowUpdates) {
std::string s_ex = "Cannot add an avp with an existing name:\n";
s_ex += avp.asString();
//------------------------------------------------------------------------------
//----------------------------------------------------- Dictionary::addCommand()
//------------------------------------------------------------------------------
-void Dictionary::addCommand(const Command & command) throw(anna::RuntimeException) {
+void Dictionary::addCommand(const Command & command) noexcept(false) {
const Command * found = getCommand(command.getId());
if(found) {
//------------------------------------------------------------------------------
//------------------------------------------------------ Dictionary::getFormat()
//------------------------------------------------------------------------------
-const Format * Dictionary::getFormat(const std::string & formatName) const throw() {
+const Format * Dictionary::getFormat(const std::string & formatName) const {
const_format_iterator it = a_formats.find(formatName);
if(it != format_end()) return ((const Format *) & ((*it).second));
//------------------------------------------------------------------------------
//------------------------------------------------------ Dictionary::getVendor()
//------------------------------------------------------------------------------
-const Vendor * Dictionary::getVendor(S32 vendorId) const throw() {
+const Vendor * Dictionary::getVendor(S32 vendorId) const {
const_vendor_iterator it = a_vendors.find(vendorId);
if(it != vendor_end()) return ((const Vendor *) & ((*it).second));
//------------------------------------------------------------------------------
//------------------------------------------------------ Dictionary::getVendor()
//------------------------------------------------------------------------------
-const Vendor * Dictionary::getVendor(const std::string & vendorName) const throw() {
+const Vendor * Dictionary::getVendor(const std::string & vendorName) const {
const_vendorNames_iterator v_it = a_vendorNames.find(vendorName);
if(v_it != a_vendorNames.end()) return ((*v_it).second);
//------------------------------------------------------------------------------
//--------------------------------------------------------- Dictionary::getAvp()
//------------------------------------------------------------------------------
-const Avp * Dictionary::getAvp(const AvpId & avpId) const throw() {
+const Avp * Dictionary::getAvp(const AvpId & avpId) const {
const_avp_iterator it = a_avps.find(avpId);
if(it != avp_end()) return ((const Avp *) & ((*it).second));
//------------------------------------------------------------------------------
//--------------------------------------------------------- Dictionary::getAvp()
//------------------------------------------------------------------------------
-const Avp * Dictionary::getAvp(const std::string & avpName) const throw() {
+const Avp * Dictionary::getAvp(const std::string & avpName) const {
const_avpNames_iterator a_it = a_avpNames.find(avpName);
if(a_it != a_avpNames.end()) return ((*a_it).second);
//------------------------------------------------------------------------------
//----------------------------------------------------- Dictionary::getCommand()
//------------------------------------------------------------------------------
-const Command * Dictionary::getCommand(const CommandId & commandId) const throw() {
+const Command * Dictionary::getCommand(const CommandId & commandId) const {
const_command_iterator it = a_commands.find(commandId);
if(it != command_end()) return ((const Command *) & ((*it).second));
//------------------------------------------------------------------------------
//----------------------------------------------------- Dictionary::getCommand()
//------------------------------------------------------------------------------
-const Command * Dictionary::getCommand(const std::string & commandName) const throw() {
+const Command * Dictionary::getCommand(const std::string & commandName) const {
const_commandNames_iterator c_it = a_commandNames.find(commandName);
if(c_it != a_commandNames.end()) return ((*c_it).second);
//------------------------------------------------------------------------------
//------------------------------------------------------- Dictionary::asString()
//------------------------------------------------------------------------------
-std::string Dictionary::asString(void) const throw() {
+std::string Dictionary::asString(void) const {
std::string trace, title;
trace += "\n";
anna::functions::TextHighlightMode::_v thm = anna::functions::TextHighlightMode::LeftAndRightline;
//------------------------------------------------------------------------------
//---------------------------------------------------------- Dictionary::asXML()
//------------------------------------------------------------------------------
-anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const throw() {
+anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const {
// <!ELEMENT dictionary (format*, vendor*, avp*, command*)>
// <!ATTLIST dictionary name CDATA #REQUIRED>
anna::xml::Node* result = parent->createChild("dictionary");
//------------------------------------------------------------------------------
//---------------------------------------------------- Dictionary::asXMLString()
//------------------------------------------------------------------------------
-std::string Dictionary::asXMLString() const throw() {
+std::string Dictionary::asXMLString() const {
anna::xml::Node root("root");
return anna::xml::Compiler().apply(asXML(&root));
}
////------------------------------------------------------------------------------
////----------------------------------------- Dictionary::checkUniqueIdentifiers()
////------------------------------------------------------------------------------
-//void Dictionary::checkUniqueIdentifiers(const anna::xml::Node *rootNode) const throw(anna::RuntimeException) {
+//void Dictionary::checkUniqueIdentifiers(const anna::xml::Node *rootNode) const noexcept(false) {
// std::map < std::string/*xml ref*/, int/*dummy*/ > formats;
// std::map < std::string/*xml ref*/, int/*dummy*/ > vendors;
// std::map < std::string/*xml ref*/, int/*dummy*/ > avps;
//------------------------------------------------------------------------------
//------------------------------------------------- Dictionary::extractFormats()
//------------------------------------------------------------------------------
-void Dictionary::extractFormats(const anna::xml::Node *rootNode) throw(anna::RuntimeException) {
+void Dictionary::extractFormats(const anna::xml::Node *rootNode) noexcept(false) {
Format aux;
for(anna::xml::Node::const_child_iterator it = rootNode->child_begin(); it != rootNode->child_end(); it++) {
//------------------------------------------------------------------------------
//------------------------------------------------- Dictionary::extractVendors()
//------------------------------------------------------------------------------
-void Dictionary::extractVendors(const anna::xml::Node *rootNode) throw(anna::RuntimeException) {
+void Dictionary::extractVendors(const anna::xml::Node *rootNode) noexcept(false) {
Vendor aux;
for(anna::xml::Node::const_child_iterator it = rootNode->child_begin(); it != rootNode->child_end(); it++) {
//------------------------------------------------------------------------------
//---------------------------------------------------- Dictionary::extractAvps()
//------------------------------------------------------------------------------
-void Dictionary::extractAvps(const anna::xml::Node *rootNode) throw(anna::RuntimeException) {
+void Dictionary::extractAvps(const anna::xml::Node *rootNode) noexcept(false) {
Avp auxAvp;
const anna::xml::Node *singleNode, *groupedNode;
throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION);
}
- auxAvpRule.setAvpName(id);
+ auxAvpRule.setAvpId(avp->getId());
auxAvpRule.setPresence(AvpRule::Presence::asEnum(type));
auxAvpRule.setQual(qual ? (qual->getValue()) : "");
gavp->addAvpRule(auxAvpRule);
//------------------------------------------------------------------------------
//------------------------------------------------ Dictionary::extractCommands()
//------------------------------------------------------------------------------
-void Dictionary::extractCommands(const anna::xml::Node *rootNode) throw(anna::RuntimeException) {
+void Dictionary::extractCommands(const anna::xml::Node *rootNode) noexcept(false) {
Command auxCommand;
// (*) Avp rules adding:
throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION);
}
- auxAvpRule.setAvpName(id);
+ auxAvpRule.setAvpId(avp->getId());
auxAvpRule.setPresence(AvpRule::Presence::asEnum(type));
auxAvpRule.setQual(qual ? (qual->getValue()) : "");
auxCommand.addAvpRule(auxAvpRule);
//------------------------------------------------------------------------------
//----------------------------------------------------------- Dictionary::load()
//------------------------------------------------------------------------------
-void Dictionary::load(const std::string & pathFile) throw(anna::RuntimeException) {
+void Dictionary::load(const std::string & pathFile) noexcept(false) {
if(pathFile == "")
throw anna::RuntimeException("Empty xml path file provided", ANNA_FILE_LOCATION);
projects / anna.git / blobdiff