diff --git a/extensions/transformiix/source/Makefile b/extensions/transformiix/source/Makefile index 3cbefd7d0625..a2c3c34186c1 100644 --- a/extensions/transformiix/source/Makefile +++ b/extensions/transformiix/source/Makefile @@ -2,7 +2,7 @@ target: TransforMiiX CC := g++ -ROOT_PATH = . +ROOT_PATH = ${PWD} BASE_PATH = $(ROOT_PATH)/base NET_PATH = $(ROOT_PATH)/net XML_PATH = $(ROOT_PATH)/xml @@ -10,6 +10,7 @@ DOM_PATH = $(XML_PATH)/dom XPATH_PATH = $(ROOT_PATH)/xpath XSLT_PATH = $(ROOT_PATH)/xslt XMLUTIL_PATH = $(XML_PATH)/util +XSLTFUNC_PATH = $(XSLT_PATH)/functions XSLTUTIL_PATH = $(XSLT_PATH)/util XMLPRINTER_PATH = $(XML_PATH)/printer XMLPARSER_PATH = $(XML_PATH)/parser @@ -17,16 +18,17 @@ EXPAT_PARSER_PATH = $(XMLPARSER_PATH)/xmlparse EXPAT_TOKEN_PATH = $(XMLPARSER_PATH)/xmltok -INCLUDE_PATHS = -I$(BASE_PATH) \ - -I$(NET_PATH) \ - -I$(DOM_PATH) \ - -I$(XML_PATH) \ - -I$(XPATH_PATH) \ - -I$(XSLT_PATH) \ - -I$(XMLUTIL_PATH) \ - -I$(XSLTUTIL_PATH) \ - -I$(XMLPARSER_PATH) \ - -I$(XMLPRINTER_PATH) \ +INCLUDE_PATHS = -I$(BASE_PATH) \ + -I$(NET_PATH) \ + -I$(DOM_PATH) \ + -I$(XML_PATH) \ + -I$(XPATH_PATH) \ + -I$(XSLT_PATH) \ + -I$(XSLTFUNC_PATH) \ + -I$(XMLUTIL_PATH) \ + -I$(XSLTUTIL_PATH) \ + -I$(XMLPARSER_PATH) \ + -I$(XMLPRINTER_PATH) \ -I$(EXPAT_PARSER_PATH) -I- BASE_OBJS = $(BASE_PATH)/*.o @@ -40,20 +42,22 @@ XMLPARSER_OBJS = $(XMLPARSER_PATH)/*.o EXPAT_TOKEN_OBJS = $(EXPAT_TOKEN_PATH)/*.o EXPAT_PARSER_OBJS = $(EXPAT_PARSER_PATH)/*.o XSLT_OBJS = $(XSLT_PATH)/*.o +XSLTFUNC_OBJS = $(XSLTFUNC_PATH)/*.o XSLTUTIL_OBJS = $(XSLTUTIL_PATH)/*.o -ALL_OBJS = $(BASE_OBJS) \ - $(NET_OBJS) \ - $(DOM_OBJS) \ - $(XPATH_OBJS) \ - $(XML_OBJS) \ - $(XMLUTIL_OBJS) \ - $(XMLPRINTER_OBJS) \ - $(XMLPARSER_OBJS) \ - $(EXPAT_TOKEN_OBJS) \ - $(EXPAT_PARSER_OBJS) \ - $(XSLT_OBJS) \ - $(XSLTUTIL_OBJS) +ALL_OBJS = $(BASE_OBJS) \ + $(NET_OBJS) \ + $(DOM_OBJS) \ + $(XPATH_OBJS) \ + $(XML_OBJS) \ + $(XMLUTIL_OBJS) \ + $(XMLPRINTER_OBJS) \ + $(XMLPARSER_OBJS) \ + $(EXPAT_TOKEN_OBJS) \ + $(EXPAT_PARSER_OBJS) \ + $(XSLT_OBJS) \ + $(XSLTFUNC_OBJS) \ + $(XSLTUTIL_OBJS) MAIN_CPP = main/transformiix.cpp @@ -95,6 +99,34 @@ $(XSLTUTIL_OBJS): $(XPATH_OBJS): cd $(XPATH_PATH); make +$(XSLTFUNC_OBJS): + cd $(XSLTFUNC_PATH); make + $(XSLT_OBJS): cd $(XSLT_PATH); make + +CMDS = rm -f *.o *~; + +clean: + + cd $(BASE_PATH); $(CMDS) \ + cd $(NET_PATH); $(CMDS) \ + cd $(XML_PATH); $(CMDS) \ + cd $(XMLUTIL_PATH); $(CMDS) \ + cd $(DOM_PATH); $(CMDS) \ + cd $(XMLPARSER_PATH); $(CMDS) \ + cd $(EXPAT_PARSER_PATH); $(CMDS) \ + cd $(EXPAT_TOKEN_PATH); $(CMDS) \ + cd $(XMLPRINTER_PATH); $(CMDS) \ + cd $(XSLT_PATH); $(CMDS) \ + cd $(XSLTUTIL_PATH); $(CMDS) \ + cd $(XSLTFUNC_PATH); $(CMDS) \ + cd $(XPATH_PATH); $(CMDS) + + + + + + + diff --git a/extensions/transformiix/source/clean.mk b/extensions/transformiix/source/clean.mk index 8d7e473d762b..2bbbcd0d214d 100644 --- a/extensions/transformiix/source/clean.mk +++ b/extensions/transformiix/source/clean.mk @@ -1,31 +1,4 @@ target: clean -PROJ_PATH = ${PWD} -ROOT_PATH = $(PROJ_PATH) -XML_PATH = $(ROOT_PATH)/xml -XMLUTIL_PATH = $(XML_PATH)/util -XSLT_PATH = $(ROOT_PATH)/xslt -BASE_PATH = $(ROOT_PATH)/base -DOM_PATH = $(XML_PATH)/dom -NET_PATH = $(ROOT_PATH)/net -XPATH_PATH = $(ROOT_PATH)/xpath -XSLTUTIL_PATH = $(XSLT_PATH)/util -XMLPRINTER_PATH = $(XML_PATH)/printer -XMLPARSER_PATH = $(XML_PATH)/parser -EXPAT_PARSER_PATH = $(XMLPARSER_PATH)/xmlparse -EXPAT_TOKEN_PATH = $(XMLPARSER_PATH)/xmltok - -CMDS = rm -f *.o *~; clean: - cd $(BASE_PATH); $(CMDS) \ - cd $(NET_PATH); $(CMDS) \ - cd $(XML_PATH); $(CMDS) \ - cd $(XMLUTIL_PATH); $(CMDS) \ - cd $(DOM_PATH); $(CMDS) \ - cd $(XMLPARSER_PATH); $(CMDS) \ - cd $(EXPAT_PARSER_PATH); $(CMDS) \ - cd $(EXPAT_TOKEN_PATH); $(CMDS) \ - cd $(XMLPRINTER_PATH); $(CMDS) \ - cd $(XSLT_PATH); $(CMDS) \ - cd $(XSLTUTIL_PATH); $(CMDS) \ - cd $(XPATH_PATH); $(CMDS) + make clean \ No newline at end of file diff --git a/extensions/transformiix/source/examples/functions.html b/extensions/transformiix/source/examples/functions.html index ec16db04aab4..1ebad9b52d62 100644 --- a/extensions/transformiix/source/examples/functions.html +++ b/extensions/transformiix/source/examples/functions.html @@ -1273,5 +1273,52 @@ + + + + + + + + + + + + + + + + + + + + +
+ XSLT Extension Functions +
+ Function: + + string + generate-id( + NodeSet? + ) +
+ Test: + <xsl:value-of select="generate-id()"/>
+
+ Note: +
    + This function will generate a unique id for the current node.I don't what this will be exactly, until run-time +
+
+ Desired Result: + + id{some-number}.0.1 +
+
+ Result: + + id134934024.0.1 +
diff --git a/extensions/transformiix/source/examples/functions.xsl b/extensions/transformiix/source/examples/functions.xsl index 61a76ef184d4..c7fed6bfd828 100644 --- a/extensions/transformiix/source/examples/functions.xsl +++ b/extensions/transformiix/source/examples/functions.xsl @@ -400,6 +400,7 @@ + @@ -1107,6 +1108,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ XSLT Extension Functions +
Function: + string generate-id(NodeSet?) +
Test: + <xsl:value-of select="generate-id()"/>
+
+ Note: +
    + + This function will generate a unique id for the current node. + I don't what this will be exactly, until run-time + +
+
Desired Result: + id{some-number}.0.1
+
Result: + + + +
+