X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fxml%2FDTDMemory.cpp;h=963d219a98d300886bd55fe5923b06c608c7a899;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=eeeaf0750db18df2c2085df9392e10dc5fd518dd;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/xml/DTDMemory.cpp b/source/xml/DTDMemory.cpp
index eeeaf07..963d219 100644
--- a/source/xml/DTDMemory.cpp
+++ b/source/xml/DTDMemory.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// 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 Google Inc. 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 <fcntl.h>
@@ -52,20 +24,21 @@ using namespace std;
 using namespace anna;
 using namespace anna::xml;
 
-DTDMemory::DTDMemory() {
+DTDMemory::DTDMemory(const char *dtd) {
   a_filename = "/tmp/anna.xml.";
   a_filename += functions::asString((int) getpid());
   a_filename += ".dtd";
+  if (dtd) initialize(dtd);
 }
 
 //---------------------------------------------------------------------------------------------
 // Aunque la libXML ofrece funciones para analizar una DTD a partir de un buffer de memoria
-// hemos sido incapaces de hacerla funcionar correctamente. Así que nos vemos obligados
-// a volcar el buffer en un archivo .. y una vez allí analizarlo con la función que analiza
+// hemos sido incapaces de hacerla funcionar correctamente. As� que nos vemos obligados
+// a volcar el buffer en un archivo .. y una vez all� analizarlo con la funci�n que analiza
 // la DTD a partir de un archivo.
 //---------------------------------------------------------------------------------------------
 _xmlDtd* DTDMemory::parse(const char* content) const
-throw(RuntimeException) {
+noexcept(false) {
   LOGMETHOD(TraceMethod tf("anna::xml::DTDMemory", "parse", ANNA_FILE_LOCATION));
   _xmlDtd* result;
   int stream;