Merge pull request #3 from Aldream/master

HTML DTD path fix
H4311 · May 1, 2012 · 5d9f664 · 5d9f664
2 parents a4321de + b482eee
commit 5d9f664
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 23 deletions.
diff --git a/tests/rapport.xsl b/tests/rapport.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="/home/bill/git/mesForks/Projet-Grammaire-Langages/tests/html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xml/Document.cpp b/xml/Document.cpp
@@ -40,6 +40,10 @@ xml::Content* xml::Document::getRoot()
 	return root;
 }
 
+string xml::Document::getFilePath() {
+	return filePath;
+}
+
 ostream& xml::Document::toString(ostream& stream)
 {
 	if (!doctype.empty())

diff --git a/xml/Document.hpp b/xml/Document.hpp
@@ -1,6 +1,5 @@
 # ifndef __DOCUMENT_H__
 # define __DOCUMENT_H__
-
 # include "ProcessingInstruction.hpp"
 # include "Content.hpp"
 # include "Comment.hpp"
@@ -26,7 +25,9 @@ namespace xml {
 		private:
 			std::string rootName;
 			std::string doctype;
-
+
+          		std::string filePath;
+
 			ProcessingInstruction *xmlProlog;
 			Content *root;
 			std::list<Comment*> comments;
@@ -48,6 +49,15 @@ namespace xml {
 				rootName = _d.first;
 				doctype = _d.second; 
 			}
+
+			/**
+			* Mutateur : Définit le chemin vers le fichier à l'origine de ce document.
+			* @param _d Chemin vers le fichier utilisé.
+			*/
+			void setFilePath(const char* _d) 
+			{ 
+				filePath = std::string(_d); 
+			}
 
 			/**
 			* Mutateur : Définit le prologue xml.
@@ -72,6 +82,12 @@ namespace xml {
 			* @returns L'élément racine.
 			*/
 			Content* getRoot();
+
+			/**
+			* Accesseur : renvoie le chemin vers le fichier à l'origine de ce document.
+			* @returns L'élément racine.
+			*/
+			std::string getFilePath();
 
 			/**
 			* Destructeur de l'objet.
@@ -81,7 +97,7 @@ namespace xml {
 			/**
 			* Constructeur par défaut de l'objet, initialise les variables aux valeurs par défaut.
 			*/
-			Document() : doctype(""), xmlProlog(0), root(0) { /* empty */ }
+			Document() : doctype(""), xmlProlog(0), root(0), filePath() { /* empty */ }
 
 			/**
 			* Affiche le contenu du document (ie l'ensemble de son arboresence) dans le flux passé.

diff --git a/xml/xml.y b/xml/xml.y
@@ -266,9 +266,13 @@ xml::Document* parseXML(const char* file)
 	fprintf(stderr, "Parse ended with %d error(s)\n", err);
 	document = NULL;
     }
+
     fclose(xmlin);
     xmllex_destroy();
   }
+  if (document != NULL) {
+	document->setFilePath(file);
+  }
 
   return document;
 }

diff --git a/xsl/Test.cpp b/xsl/Test.cpp
@@ -71,8 +71,8 @@ struct XSLProcessTest_NoHTMLDTD : public TestCase
 		xml::Document* document = NULL;
 		dtd::Document* docDtd;
 
-		docDtd = parseDTD("tests/html.dtd");
-		document = parseXML("tests/testNoHTMLDTD.xsl");
+		docDtd = parseDTD("./tests/html.dtd");
+		document = parseXML("./tests/testNoHTMLDTD.xsl");
 		XSLProcessor xslProcessor = XSLProcessor();
 		try{
 			xslProcessor.setXslDTD(docDtd);
@@ -101,7 +101,6 @@ struct XSLProcessTest_InvalidHTMLDTD : public TestCase
 
 		docXml = parseXML("./tests/testHtmlDtdInvalid.xsl");
 		docDtd = parseDTD("./tests/xsl.dtd");
-
 		try {
 			proc.setXslDTD(docDtd);
 			proc.processXslFile(docXml);

diff --git a/xsl/XSLProcessor.cpp b/xsl/XSLProcessor.cpp
@@ -1,4 +1,3 @@
-
 /**
 * @file XSLProcessor.cpp
 * @brief Implementation - XSL processing functions
@@ -8,8 +7,6 @@
 * @author Daniel BAUDRY & Benjamin Bill PLANCHE (Aldream)
 */
 
-#include <iostream>
-
 #include "XSLProcessor.hpp"
 
 #include "../xml/basics.h"
@@ -75,10 +72,17 @@ void xsl::XSLProcessor::processXslFile(xml::Document* newXslDoc) throw (string)
 	string attrXMLNS = rootXSL->getAttributeValue("xmlns:xsl");
 	if (attrXMLNS.empty()) {
 		throw(ERROR_NO_XMLNS);
-	}		
+	}	
 
+	// --------- Building a full path, by prepending the path to the folder of the XSL file to the path to the HTML DTD file (without this, if the program is running in a different folder than the XSL file, it won't be able to find the HTML DTD with the relative path of the XSL) 
+	string xslPath = newXslDoc->getFilePath();
+	string fullHtmlDtdPath = attrXMLNS;
+	if (attrXMLNS[0] != '/') {
+		string xslFolder = xslPath.substr(0, xslPath.find_last_of("/\\"));
+		fullHtmlDtdPath = xslFolder + "/" + attrXMLNS;
+	}	
 	// --------- Opening, validating ant getting the structure of the HTML DTD file :
-	dtd::Document * htmlDTDdoc = parseDTD(attrXMLNS.c_str());
+	dtd::Document * htmlDTDdoc = parseDTD(fullHtmlDtdPath.c_str());
 	if (htmlDTDdoc == NULL) {
 		throw(ERROR_INVALID_HTML_DTD);
 	}	

diff --git a/xsl/tests/rapport.xsl b/xsl/tests/rapport.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/rapportInvalidXSL.xsl b/xsl/tests/rapportInvalidXSL.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport"
 	>

diff --git a/xsl/tests/rapportSemanticHTML.xsl b/xsl/tests/rapportSemanticHTML.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/rapportSemanticXSL.xsl b/xsl/tests/rapportSemanticXSL.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/testApplyTemplates.xsl b/xsl/tests/testApplyTemplates.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/testAttribute.xsl b/xsl/tests/testAttribute.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/testComplex.xsl b/xsl/tests/testComplex.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/testHtmlDtdInvalid.xsl b/xsl/tests/testHtmlDtdInvalid.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html_invalid.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html_invalid.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/testNoRoot.xsl b/xsl/tests/testNoRoot.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="titre"></xsl:template>
 

diff --git a/xsl/tests/testSimple.xsl b/xsl/tests/testSimple.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>

diff --git a/xsl/tests/testValueOf.xsl b/xsl/tests/testValueOf.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="./tests/html.dtd">
+<xsl:stylesheet version="1.0" xmlns:xsl="./html.dtd">
 
 	<xsl:template match="rapport">
 		<html>