From 2ddd370e5f42523853a38d2568c009fe11049e3b Mon Sep 17 00:00:00 2001 From: eraviart <> Date: Tue, 29 Jun 2004 20:02:53 +0000 Subject: [PATCH] Once upon a time, a minor god decided to use the term "stylesheet". Then God (The True and Only God) sayd : "Use XSL". Later God decided: "Use XSLT". And now He says "Use SiteXslt". In God I trust, so I obey. --- config-bugs.xml | 2 +- config-consultation.xml | 2 +- config-dbxmltest.xml | 2 +- config-formulaires.xml | 2 +- config-label.villes-internet.net.xml | 2 +- config-liberty-alliance.xml | 2 +- config-w3c.xml | 2 +- config.xml | 2 +- src/core/dataholders.py | 21 ++++++++--------- src/core/http.py | 35 +++++++++++----------------- src/core/stations.py | 2 +- src/modules/dbxmlcontainers.py | 3 ++- src/modules/libertyalliance.py | 2 +- src/modules/libertyalliance0.py | 2 +- src/modules/xforms/xforms.py | 3 +++ 15 files changed, 40 insertions(+), 44 deletions(-) diff --git a/config-bugs.xml b/config-bugs.xml index f89f7b1..3bef922 100644 --- a/config-bugs.xml +++ b/config-bugs.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl /var/log/expression.log expression.pid webmaster@localhost diff --git a/config-consultation.xml b/config-consultation.xml index 37235c5..0e36231 100644 --- a/config-consultation.xml +++ b/config-consultation.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl webmaster@localhost diff --git a/config-dbxmltest.xml b/config-dbxmltest.xml index fee5890..acb204a 100644 --- a/config-dbxmltest.xml +++ b/config-dbxmltest.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl /var/log/expression.log expression.pid webmaster@localhost diff --git a/config-formulaires.xml b/config-formulaires.xml index 1967851..4f0a137 100644 --- a/config-formulaires.xml +++ b/config-formulaires.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl /var/log/expression.log expression.pid webmaster@localhost diff --git a/config-label.villes-internet.net.xml b/config-label.villes-internet.net.xml index ccd8cd3..2a30be8 100644 --- a/config-label.villes-internet.net.xml +++ b/config-label.villes-internet.net.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl /var/log/expression.log expression.pid webmaster@localhost diff --git a/config-liberty-alliance.xml b/config-liberty-alliance.xml index caef262..e77f39f 100644 --- a/config-liberty-alliance.xml +++ b/config-liberty-alliance.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl /var/log/expression.log expression.pid webmaster@localhost diff --git a/config-w3c.xml b/config-w3c.xml index b898b37..f1282f7 100644 --- a/config-w3c.xml +++ b/config-w3c.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl /var/log/expression.log expression.pid webmaster@localhost diff --git a/config.xml b/config.xml index 3a3b422..8c718ea 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ - vhosts/system/xslt/site.xsl + vhosts/system/xslt/site.xsl /var/log/expression.log expression.pid webmaster@localhost diff --git a/src/core/dataholders.py b/src/core/dataholders.py index da9ea8d..f1e5012 100644 --- a/src/core/dataholders.py +++ b/src/core/dataholders.py @@ -84,7 +84,7 @@ class DataHolder(stations.AbstractStation): _data = None _dataHolderInited = False _metadata = None - _stylesheet = None + _xslt = None defaultFileNameExtension = None mimeType = None mimeTypes = None @@ -460,23 +460,22 @@ class DataHolder(stations.AbstractStation): def getSimpleLabel(self): return _("Untitled Object #%s") % self.localId - def getXslt(self): - if self._stylesheet is None: - xslAbsolutePath = self.getConfigAbsolutePath("yep:xsltFilePath", default = None) + def getSiteXslt(self): + if self._xslt is None: + xslAbsolutePath = self.getConfigAbsolutePath("yep:siteXsltFilePath", default = None) if xslAbsolutePath is None: - self._stylesheet == "none" + self._xslt == "none" else: - stylesheetHolder = DataHolder( + xsltHolder = DataHolder( pathFragment = xslAbsolutePath, previous = self, mimeType = "text/xml", isRootElder = True, containedFileSystem = filesystems.PartialFileSystem(xslAbsolutePath)) import stylesheets - stylesheetPrototype = stylesheetHolder.getRootElement() - self._stylesheet = stylesheets.StylesheetContext( - stylesheetPrototype, self, previous = self) - if self._stylesheet == "none": + xsltPrototype = xsltHolder.getRootElement() + self._xslt = stylesheets.StylesheetContext(xsltPrototype, self, previous = self) + if self._xslt == "none": return None - return self._stylesheet + return self._xslt def getWebDavContentLength(self): if self._data is None: diff --git a/src/core/http.py b/src/core/http.py index e1f0a63..0621b37 100644 --- a/src/core/http.py +++ b/src/core/http.py @@ -296,9 +296,8 @@ class HttpRequestHandlerMixin: errorDescription = errorElement.getDescription() if errorDescription: xmlDocument = errorDescription.generateXmlDocument() - stylesheet = station.getDataHolder().getXslt() - mimeType, styledData = station.generateXmlDocumentStyledData( - xmlDocument, stylesheet) + xslt = station.getDataHolder().getSiteXslt() + mimeType, styledData = station.generateXmlDocumentStyledData(xmlDocument, xslt) if mimeType == "text/html": data = styledData return self.send_error(403, message, data) @@ -316,9 +315,8 @@ class HttpRequestHandlerMixin: errorDescription = errorElement.getDescription() if errorDescription: xmlDocument = errorDescription.generateXmlDocument() - stylesheet = station.getDataHolder().getXslt() - mimeType, styledData = station.generateXmlDocumentStyledData( - xmlDocument, stylesheet) + xslt = station.getDataHolder().getSiteXslt() + mimeType, styledData = station.generateXmlDocumentStyledData(xmlDocument, xslt) if mimeType == "text/html": data = styledData return self.send_error(400, message, data) @@ -333,9 +331,8 @@ class HttpRequestHandlerMixin: errorDescription = errorElement.getDescription() if errorDescription: xmlDocument = errorDescription.generateXmlDocument() - stylesheet = station.getDataHolder().getXslt() - mimeType, styledData = station.generateXmlDocumentStyledData( - xmlDocument, stylesheet) + xslt = station.getDataHolder().getSiteXslt() + mimeType, styledData = station.generateXmlDocumentStyledData(xmlDocument, xslt) if mimeType == "text/html": data = styledData return self.send_error(500, message, data) @@ -366,9 +363,8 @@ class HttpRequestHandlerMixin: errorDescription = errorElement.getDescription() if errorDescription: xmlDocument = errorDescription.generateXmlDocument() - stylesheet = station.getDataHolder().getXslt() - mimeType, styledData = station.generateXmlDocumentStyledData( - xmlDocument, stylesheet) + xslt = station.getDataHolder().getSiteXslt() + mimeType, styledData = station.generateXmlDocumentStyledData(xmlDocument, xslt) if mimeType == "text/html": data = styledData return self.send_error(404, message, data) @@ -388,9 +384,8 @@ class HttpRequestHandlerMixin: errorDescription = errorElement.getDescription() if errorDescription: xmlDocument = errorDescription.generateXmlDocument() - stylesheet = station.getDataHolder().getXslt() - mimeType, styledData = station.generateXmlDocumentStyledData( - xmlDocument, stylesheet) + xslt = station.getDataHolder().getSiteXslt() + mimeType, styledData = station.generateXmlDocumentStyledData(xmlDocument, xslt) if mimeType == "text/html": data = styledData if station.getConfigBoolean("yep:useHttpAuthentication", default = False): @@ -422,9 +417,8 @@ class HttpRequestHandlerMixin: errorDescription = errorElement.getDescription() if errorDescription: xmlDocument = errorDescription.generateXmlDocument() - stylesheet = station.getDataHolder().getXslt() - mimeType, styledData = station.generateXmlDocumentStyledData( - xmlDocument, stylesheet) + xslt = station.getDataHolder().getSiteXslt() + mimeType, styledData = station.generateXmlDocumentStyledData(xmlDocument, xslt) if mimeType == "text/html": data = styledData self.send_response(302, message) @@ -453,9 +447,8 @@ class HttpRequestHandlerMixin: errorDescription = errorElement.getDescription() if errorDescription: xmlDocument = errorDescription.generateXmlDocument() - stylesheet = station.getDataHolder().getXslt() - mimeType, styledData = station.generateXmlDocumentStyledData( - xmlDocument, stylesheet) + xslt = station.getDataHolder().getSiteXslt() + mimeType, styledData = station.generateXmlDocumentStyledData(xmlDocument, xslt) if mimeType == "text/html": data = styledData self.send_response(201, message) diff --git a/src/core/stations.py b/src/core/stations.py index 50adf4e..86874a2 100644 --- a/src/core/stations.py +++ b/src/core/stations.py @@ -839,7 +839,7 @@ class AbstractStation(object): command = environs.getVar("httpCommand") if command == "GET": xmlDocument = self.generateXmlDocument() - stylesheet = self.getDataHolder().getXslt() + stylesheet = self.getDataHolder().getSiteXslt() self.outputHttpHtmlDocument(xmlDocument, stylesheet) else: raise faults.PathNotFound(environs.getVar("currentStation"), "") diff --git a/src/modules/dbxmlcontainers.py b/src/modules/dbxmlcontainers.py index 761be08..ff4d542 100644 --- a/src/modules/dbxmlcontainers.py +++ b/src/modules/dbxmlcontainers.py @@ -106,8 +106,9 @@ class DbXmlContainerHolder(dataholders.DataHolder): childNode.newProp("id", str(document.getID())) childNode.newProp("name", document.getName()) resultNode.addChild(childNode) - return DbXmlDocumentResult( + result = DbXmlDocumentResult( resultNode, previous = self, uriPathFragment = self.uriPathFragment, owner = self) + return result def getDbXmlNodeResultFromXpath(self, xpathExpression): results = self.getResultFetchedFromXpath(xpathExpression, dbxml.XmlQueryContextPtr.ResultValues) diff --git a/src/modules/libertyalliance.py b/src/modules/libertyalliance.py index d6a3cfa..7b8494f 100644 --- a/src/modules/libertyalliance.py +++ b/src/modules/libertyalliance.py @@ -275,7 +275,7 @@ You have been succesfully authenticated; click ok to go back to the service prov enctype = "multipart/form-data", method = "post"))) htmlDocument = documents.newTemporaryHtmlDocument() htmlDocument.append(layout) - stylesheet = self.getDataHolder().getXslt() + stylesheet = self.getDataHolder().getSiteXslt() self.outputHttpHtmlDocument(htmlDocument, stylesheet) else: # Unknown protocol profile. We dont know what to do : diff --git a/src/modules/libertyalliance0.py b/src/modules/libertyalliance0.py index b45f1b2..12fc455 100644 --- a/src/modules/libertyalliance0.py +++ b/src/modules/libertyalliance0.py @@ -247,7 +247,7 @@ provider.\ enctype = "multipart/form-data", method = "post"))) htmlDocument = documents.newTemporaryHtmlDocument() htmlDocument.append(layout) - stylesheet = self.getDataHolder().getXslt() + stylesheet = self.getDataHolder().getSiteXslt() self.outputHttpHtmlDocument(htmlDocument, stylesheet) else: # Unknown profile. We dont know what to do : diff --git a/src/modules/xforms/xforms.py b/src/modules/xforms/xforms.py index 2f8b623..bb0070a 100644 --- a/src/modules/xforms/xforms.py +++ b/src/modules/xforms/xforms.py @@ -918,6 +918,9 @@ class DummyInstance(object): def getRootElement(self): return self._rootElement + def serialize(self): + return self._rootElement.serialize() + class Item(WidgetElement): def generateHtmlContextControlCheckBoxesForm(