Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Not part of regular build. Improved namespace handling.

Browse Source
This commit is contained in:
kvisco%ziplink.net 2001-01-22 09:39:55 +00:00
parent 0d8d5a5ee3
commit 47cfd09205
3 changed files with 143 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
extensions/transformiix/source/xslt/ProcessorState.cpp
View File

@ -25,13 +25,13 @@
* -- added code in ::resolveFunctionCall to support the
* document() function.
*
* $Id: ProcessorState.cpp,v 1.14 2001/01/19 21:24:44 axel%pike.org Exp $
* $Id: ProcessorState.cpp,v 1.15 2001/01/22 09:39:54 kvisco%ziplink.net Exp $
*/
/**
* Implementation of ProcessorState
* Much of this code was ported from XSL:P
* @version $Revision: 1.14 $ $Date: 2001/01/19 21:24:44 $
* @version $Revision: 1.15 $ $Date: 2001/01/22 09:39:54 $
**/
#include "ProcessorState.h"
@ -49,6 +49,7 @@ const String ProcessorState::wrapperNS = "http://www.mitre.org/TransforMi
ProcessorState::ProcessorState() {
this->xslDocument = NULL;
this->resultDocument = NULL;
currentAction = 0;
initialize();
} //-- ProcessorState
@ -59,6 +60,7 @@ ProcessorState::ProcessorState() {
ProcessorState::ProcessorState(Document& xslDocument, Document& resultDocument) {
this->xslDocument = &xslDocument;
this->resultDocument = &resultDocument;
currentAction = 0;
initialize();
} //-- ProcessorState
@ -89,6 +91,14 @@ ProcessorState::~ProcessorState() {
delete iter;
delete keys;
//-- clean up XSLT actions stack
while (currentAction) {
XSLTAction* item = currentAction;
item->node = 0;
currentAction = item->prev;
item->prev = 0;
delete item;
}
} //-- ~ProcessorState
@ -418,8 +428,11 @@ Element* ProcessorState::getNamedTemplate(String& name) {
return 0;
} //-- getNamedTemplate
/**
* Returns the namespace URI for the given name
* Returns the namespace URI for the given name, this method should only be
* called for determining a namespace declared within the context (ie. the stylesheet)
**/
void ProcessorState::getNameSpaceURI(const String& name, String& nameSpaceURI) {
String prefix;
@ -429,21 +442,23 @@ void ProcessorState::getNameSpaceURI(const String& name, String& nameSpaceURI) {
} //-- getNameSpaceURI
/**
* Returns the namespace URI for the given namespace prefix
* Returns the namespace URI for the given namespace prefix, this method should
* only be called for determining a namespace declared within the context
* (ie. the stylesheet)
**/
void ProcessorState::getNameSpaceURIFromPrefix(const String& prefix, String& nameSpaceURI) {
if (prefix.length() == 0) {
nameSpaceURI.clear();
nameSpaceURI.append(*(String*)defaultNameSpaceURIStack.peek());
}
else {
String* result = (String*)nameSpaceMap.get(prefix);
if (result) {
nameSpaceURI.clear();
nameSpaceURI.append(*result);
XSLTAction* action = currentAction;
while (action) {
Node* node = action->node;
if (( node ) && (node->getNodeType() == Node::ELEMENT_NODE)) {
if (XMLDOMUtils::getNameSpace(prefix, (Element*) node, nameSpaceURI))
break;
}
action = action->prev;
}
} //-- getNameSpaceURI
/**
@ -479,6 +494,27 @@ Document* ProcessorState::getResultDocument() {
return resultDocument;
} //-- getResultDocument
/**
* Returns the namespace URI for the given name, this method should only be
* called for returning a namespace declared within in the result document.
**/
void ProcessorState::getResultNameSpaceURI(const String& name, String& nameSpaceURI) {
String prefix;
XMLUtils::getNameSpace(name, prefix);
if (prefix.length() == 0) {
nameSpaceURI.clear();
nameSpaceURI.append(*(String*)defaultNameSpaceURIStack.peek());
}
else {
String* result = (String*)nameSpaceMap.get(prefix);
if (result) {
nameSpaceURI.clear();
nameSpaceURI.append(*result);
}
}
} //-- getResultNameSpaceURI
NodeSet* ProcessorState::getTemplates() {
return &templates;
} //-- getTemplates
@ -502,6 +538,38 @@ MBool ProcessorState::isXSLStripSpaceAllowed(Node* node) {
} //--isXSLStripSpaceAllowed
/**
* Removes the current XSLT action from the top of the stack.
* @returns the XSLT action after removing from the top of the stack
**/
Node* ProcessorState::popAction() {
Node* xsltAction = 0;
if (currentAction) {
xsltAction = currentAction->node;
XSLTAction* item = currentAction;
currentAction = currentAction->prev;
item->node = 0;
delete item;
}
return xsltAction;
} //-- popAction
/**
* Adds the given XSLT action to the top of the action stack
**/
void ProcessorState::pushAction(Node* xsltAction) {
if (currentAction) {
XSLTAction* newAction = new XSLTAction;
newAction->prev = currentAction;
currentAction = newAction;
}
else {
currentAction = new XSLTAction;
currentAction->prev = 0;
}
currentAction->node = xsltAction;
} //-- pushAction
/**
* Adds the set of names to the Whitespace preserving element set
**/
@ -521,7 +589,7 @@ void ProcessorState::preserveSpace(String& names) {
/**
* Sets a new default Namespace URI.
**/
void ProcessorState::setDefaultNameSpaceURI(const String& nsURI) {
void ProcessorState::setDefaultNameSpaceURIForResult(const String& nsURI) {
String* nsTempURIPointer = 0;
String* nsURIPointer = 0;
StringListIterator theIterator(&nameSpaceURIList);
@ -554,7 +622,7 @@ void ProcessorState::setDocumentBase(const String& documentBase) {
void ProcessorState::setOutputMethod(const String& method) {
format.setMethod(method);
if ( method.indexOf(HTML) == 0 ) {
setDefaultNameSpaceURI(HTML_NS);
setDefaultNameSpaceURIForResult(HTML_NS);
}
}
@ -825,13 +893,17 @@ void ProcessorState::initialize() {
nodeStack = new NodeStack();
nodeStack->push(this->resultDocument);
setDefaultNameSpaceURI("");
setDefaultNameSpaceURIForResult("");
//-- determine xsl properties
Element* element = NULL;
if (xslDocument)
if (xslDocument) {
element = xslDocument->getDocumentElement();
}
if ( element ) {
pushAction(element);
//-- process namespace nodes
NamedNodeMap* atts = element->getAttributes();
if ( atts ) {
@ -844,7 +916,8 @@ void ProcessorState::initialize() {
XMLUtils::getLocalPart(attName, ns);
// default namespace
if ( attName.isEqual(XMLUtils::XMLNS) ) {
setDefaultNameSpaceURI(attValue);
//-- Is this correct?
setDefaultNameSpaceURIForResult(attValue);
}
// namespace declaration
else {
@ -906,11 +979,13 @@ void ProcessorState::initialize() {
dfTextTemplate->appendChild(value_of);
templates.add(dfTextTemplate);
String wild("*");
//-- add PatternExpr hash for default templates
patternExprHash.put("*", new WildCardExpr());
patternExprHash.put("*", new ElementExpr(wild));
patternExprHash.put("/", new RootExpr());
patternExprHash.put("text()", new TextExpr());
//cout << "XSLT namespace: " << xsltNameSpace << endl;
}
}

41
extensions/transformiix/source/xslt/ProcessorState.h
View File

@ -21,7 +21,7 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
* $Id: ProcessorState.h,v 1.8 2001/01/19 21:24:44 axel%pike.org Exp $
* $Id: ProcessorState.h,v 1.9 2001/01/22 09:39:55 kvisco%ziplink.net Exp $
*/
@ -50,7 +50,7 @@
/**
* Class used for keeping the current state of the XSL Processor
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.8 $ $Date: 2001/01/19 21:24:44 $
* @version $Revision: 1.9 $ $Date: 2001/01/22 09:39:55 $
**/
class ProcessorState : public ContextState {
@ -179,6 +179,13 @@ public:
**/
Document* getResultDocument();
/**
* Returns the namespace URI for the given name, this method should
* only be called to get a namespace declared within the result
* document.
**/
void getResultNameSpaceURI(const String& name, String& nameSpaceURI);
/**
* Returns a pointer to a list of available templates
**/
@ -209,9 +216,21 @@ public:
void preserveSpace(String& names);
/**
* Sets a new default Namespace URI.
* Removes the current XSLT action from the top of the stack.
* @returns the XSLT action after removing from the top of the stack
**/
Node* popAction();
/**
* Adds the given XSLT action to the top of the action stack
**/
void pushAction(Node* xsltAction);
/**
* Sets a new default Namespace URI. This is used for the Result Tree
**/
void setDefaultNameSpaceURI(const String& nsURI);
void setDefaultNameSpaceURIForResult(const String& nsURI);
/**
* Sets the document base for including and importing stylesheets
@ -292,12 +311,16 @@ public:
//------------------------------------------/
/**
* Returns the namespace URI for the given name
* Returns the namespace URI for the given name, this method should
* only be called to get a namespace declared within the context (ie.
* the stylesheet).
**/
void getNameSpaceURI(const String& name, String& nameSpaceURI);
/**
* Returns the namespace URI for the given namespace prefix
* Returns the namespace URI for the given namespace prefix. This method
* should only be called to get a namespace declared within the
* context (ie. the stylesheet).
**/
void getNameSpaceURIFromPrefix(const String& prefix, String& nameSpaceURI);
@ -305,6 +328,10 @@ private:
enum XMLSpaceMode {STRIP = 0, DEFAULT, PRESERVE};
struct XSLTAction {
Node* node;
XSLTAction* prev;
};
/**
* Allows us to overcome some DOM deficiencies
@ -364,6 +391,7 @@ private:
NodeSet templates;
XSLTAction* currentAction;
Stack nodeSetStack;
Document* xslDocument;
Document* resultDocument;
@ -375,6 +403,7 @@ private:
NamedMap nameSpaceMap;
StringList nameSpaceURIList;
Stack defaultNameSpaceURIStack;
Stack xsltNameSpaces;
//-- default templates
Element* dfWildCardTemplate;

22
extensions/transformiix/source/xslt/XSLTProcessor.cpp
View File

@ -38,7 +38,7 @@
* Olivier Gerardin
* -- Changed behavior of passing parameters to templates
*
* $Id: XSLTProcessor.cpp,v 1.28 2001/01/12 20:06:43 axel%pike.org Exp $
* $Id: XSLTProcessor.cpp,v 1.29 2001/01/22 09:39:55 kvisco%ziplink.net Exp $
*/
#include "XSLTProcessor.h"
@ -53,7 +53,7 @@
/**
* XSLTProcessor is a class for Processing XSL styelsheets
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.28 $ $Date: 2001/01/12 20:06:43 $
* @version $Revision: 1.29 $ $Date: 2001/01/22 09:39:55 $
**/
/**
@ -74,7 +74,7 @@ XSLTProcessor::XSLTProcessor() {
xslVersion.append("1.0");
appName.append("TransforMiiX");
appVersion.append("1.0 [beta v20000725]");
appVersion.append("1.0 [beta v20010121]");
//-- create XSL element types
@ -865,6 +865,8 @@ void XSLTProcessor::processAction
Expr* expr = 0;
Element* actionElement = (Element*)xslAction;
ps->pushAction(actionElement);
switch ( getElementType(nodeName, ps) ) {
//-- xsl:apply-templates
@ -1311,7 +1313,7 @@ void XSLTProcessor::processAction
String nsURI = actionElement->getAttribute(XMLUtils::XMLNS);
if ( nsURI.length() != 0 ) {
// Set the default namespace
ps->setDefaultNameSpaceURI(nsURI);
ps->setDefaultNameSpaceURIForResult(nsURI);
newDefaultNS = MB_TRUE;
}
@ -1374,8 +1376,9 @@ void XSLTProcessor::processAction
}
#endif
break;
}
}
} //-- switch
ps->popAction();
} //-- end if (element)
//cout << "XSLTProcessor#processAction [exit]\n";
} //-- processAction
@ -1631,12 +1634,15 @@ void XSLTProcessor::xslCopy(Node* node, Element* action, ProcessorState* ps) {
String nsURI = element->getAttribute(XMLUtils::XMLNS);
if ( nsURI.length() != 0 ) {
// Set the default namespace
ps->setDefaultNameSpaceURI(nsURI);
ps->setDefaultNameSpaceURIForResult(nsURI);
newDefaultNS = MB_TRUE;
}
String nameSpaceURI;
ps->getNameSpaceURI(nodeName, nameSpaceURI);
String prefix;
int idx = nodeName.indexOf(':');
if (idx >= 0) nodeName.subString(0, idx, prefix);
XMLDOMUtils::getNameSpace(prefix, element, nameSpaceURI);
// XXX HACK (pvdb) Workaround for BUG 51656 Html rendered as xhtml
if (ps->getOutputFormat()->isHTMLOutput()) {
nodeName.toLowerCase();