Changeset 25341 in main

Timestamp:

06/09/22 21:02:29 (12 months ago)

Author:

GarthBraithwaite_STG

Message:

view - upgraded saxon. xslt document to doc and assoc notes where applic.

Location:

trunk/ibisph-view/src/main/webapp

Files:

• WEB-INF/lib/saxon-he-11.3.jar (added)
• WEB-INF/lib/saxon-he-9.9.0.jar (deleted)
• js/KendoLeafletDataViz.js (modified) (1 diff)
• xslt/_ibis-include.xslt (modified) (5 diffs)
• xslt/html/SiteSpecific.xslt (modified) (1 diff)
• xslt/html/community/facts/Page.xslt (modified) (1 diff)
• xslt/html/community/indicator/Page.xslt (modified) (2 diffs)
• xslt/html/community/initiatives/Page.xslt (modified) (1 diff)
• xslt/html/indicator/profile/Indicator.xslt (modified) (3 diffs)
• xslt/html/indicator/profile/complete_profile/Page.xslt (modified) (1 diff)
• xslt/html/indicator/profile/summary/Page.xslt (modified) (1 diff)
• xslt/html/query/module/report/configurations_by_file.xslt (modified) (1 diff)
• xslt/ibis.xslt (modified) (1 diff)
• xslt/json/IndicatorViewDataset.xslt (modified) (2 diffs)
• xslt/xml/Initiative.xslt (modified) (1 diff)

trunk/ibisph-view/src/main/webapp/js/KendoLeafletDataViz.js

@@ -248 +248 @@
 
 
-
-// ***************************** FUNCS THAT ARE CURRENTLY NOT USED...
-KendoLeafletDataViz.getChartImage = function()
-{
-// doesn't              var svg = $kendoChart.kendoChart.svg();
-//      works           var svg = $kendoChart.data("kendoChart").svg();
-        var svg = $kendoChart.getKendoChart().svg();
-        KendoLeafletDataViz.getImage(svg);
-}; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-KendoLeafletDataViz.getMapImage = function()
-{
-        console.debug("KendoLeafletDataViz.getMapImage - chart data: " + $kendoChart.data("kendoChart"));
-        console.debug("KendoLeafletDataViz.getMapImage - leaflet data: " + $leafletMap.data("leaflet"));
-        // xml declaration is NOT needed...
-        var svg = "START_MARKER" + $(".leaflet-overlay-pane").html();
-        svg = svg.replace("START_MARKER<svg", "<svg xmlns='http://www.w3.org/2000/svg' version='1.1' ");
-        KendoLeafletDataViz.getImage(svg);
-}; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-KendoLeafletDataViz.getImage = function(svg)
-{
-//svg = $(svg).replaceAll("stroke=''", "");
-//alert("SVG: " +svg);
-
-        this.xhr = $.ajax({
-                type: "POST"
-//                              ,url: "<xsl:value-of select="$ibis.contextPath"/>svgtoimage/download.png"
-                ,crossDomain: true
-                ,headers: {
-                        "accept": "image/png"
-                        ,"content-Type": "image/svg+xml"
-                }
-                ,data: svg 
-                ,success: function(data, textStatus, jqXHR)
-                {
-                        console.debug("KendoLeafletDataViz.getImage - Converting SVG to Image - success status: "+ textStatus);
-                        this.insertImageData(data);
-                }
-                ,error: function(jqXHR, textStatus, errorThrown)
-                {
-                        console.debug("KendoLeafletDataViz.getImage - Converting SVG to Image - ERROR: "+ errorThrown+", Status: ", textStatus);
-                }
-// breaks things...                                     ,dataType: "xml"
-        });
-}; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-KendoLeafletDataViz.insertImageData = function(imageData)
-{
-        var imgSrc  = "data:image/png;base64," + imageData;
-        var imgHTML = "<img src=\"" + imgSrc + "\"/>";
-        $("#rasterImage").html(imgHTML);
-}; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
 // Called for title type value sorting.  If error converting simply return equal (0).
 KendoLeafletDataViz.valueTitleSortComparision = function(a, b) 

trunk/ibisph-view/src/main/webapp/xslt/_ibis-include.xslt

@@ -211 +211 @@
                         standard call-template xslt processing needs to include a file.  
 
-                        IMPORTANT NOTE:
+                        IMPORTANT NOTES:
                         Prior to 7/7/2020 had various include attribute matching templates
                         that handled more specialized processing.  However, as things evolved
@@ -220 +220 @@
                         duplicate handling rules.  See that code for some of the attempts to
                         allow for module matches.
-                "
-        >
-                <xsl:param name="url"/>
+
+                        The more complex XSLT only docment() fn vs doc() is used so that 
+                        the file can be referenced relative to the main XML supplied in the
+                        xform operation.  Otherwise the single file doc() fn should be used.
+
+                        No try catch file error handling is done as want it to blow up so 
+                        the issue is front and center and gets fixed.
+
+                        Params are not typed i.e. as=xs:string because some use cases involve
+                        element attribute values.
+                "
+        >
+                <xsl:param name="url"
+                        ibis:doc="Required value used to locate the XML file to be included
+                                and processed.  
+
+                                NOTE: the use of document() vs doc().  If the URL is relative 
+                                the document() call uses the main xform XML file URI as it's 
+                                base path.  If doc() is used the URL must be a complete file 
+                                path URL otherwise it will be relative to the XSLT file.  In 
+                                either case fully qualified URLs work.  
+                        "
+                />
                 <xsl:param name="basePathType" 
                         ibis:doc="Optional value that specifies where to look for the file
@@ -238 +258 @@
                         "
                 />
-                <xsl:param name="childNameList"
+                <xsl:param name="childNameList" 
                         ibis:doc="Optional blank or csv list of child NAME element values to limit 
                                 included elements (like DIMENSION) and any other includes that 
@@ -253 +273 @@
                         "
                 />
+
                 <xsl:variable name="url" 
-                        select="if(not($basePathType)) then $url 
+                        select="if(0 = string-length($basePathType)) then $url 
                                 else if('publishedxml' = lower-case($basePathType)) then ibis:getPublishedXMLPath($url) 
                                 else ibis:getContentPath($url) 
                         "
                 />
-
                 <xsl:choose>
                         <xsl:when test="$childNameList">
@@ -266 +286 @@
                         </xsl:when>
                         <xsl:when test="$includeChildrenOnly">
-                                <xsl:apply-templates select="document($url, /)/(*/text() | */*)" mode="ibis.copy"/>
+                                <xsl:apply-templates select="document($url)/(*/text() | */*)" mode="ibis.copy"/>
                         </xsl:when>
                         <xsl:otherwise>
-                                <xsl:apply-templates select="document($url, /)/*" mode="ibis.copy"/>
+                                <xsl:apply-templates select="document($url)/*" mode="ibis.copy"/>
                         </xsl:otherwise>
                 </xsl:choose>

trunk/ibisph-view/src/main/webapp/xslt/html/SiteSpecific.xslt

@@ -42 +42 @@
                         solution."
         >
-                <xsl:apply-templates select="document(ibis:getContentPath('xml/selections/navigation/SiteNavigationSelections.xml'))/SELECTIONS/*" mode="ibis.copy"/>
+                <xsl:apply-templates select="doc(ibis:getContentPath('xml/selections/navigation/SiteNavigationSelections.xml'))/SELECTIONS/*" mode="ibis.copy"/>
         </xsl:param>
         <xsl:param name="SiteSpecific.siteAuthenticatedUserSelections">
-                <xsl:apply-templates select="document(ibis:getContentPath('xml/selections/navigation/AuthenticatedUserSelection.xml'))/SELECTION/SELECTIONS" mode="ibis.copy"/>
+                <xsl:apply-templates select="doc(ibis:getContentPath('xml/selections/navigation/AuthenticatedUserSelection.xml'))/SELECTION/SELECTIONS" mode="ibis.copy"/>
         </xsl:param>
         <xsl:param name="SiteSpecific.siteNonAuthenticatedUserSelections">
-                <xsl:apply-templates select="document(ibis:getContentPath('xml/selections/navigation/UserSelection.xml'))/SELECTION/SELECTIONS" mode="ibis.copy"/>
+                <xsl:apply-templates select="doc(ibis:getContentPath('xml/selections/navigation/UserSelection.xml'))/SELECTION/SELECTIONS" mode="ibis.copy"/>
         </xsl:param>
 

trunk/ibisph-view/src/main/webapp/xslt/html/community/facts/Page.xslt

@@ -16 +16 @@
                 <name>html/community/facts/Page</name>
                 <summary>
+                        THIS IS NOT A WORKING PAGE.  MUCH NEEDS TO BE DEFINED and IMPLEMENTED.
+                        THIS IS SIMPLY LEFT HERE AS A STUBB FOR POSSIBLE FUTURE WORK.
+
                         Provides the Special Introduction Overrides to be able to process 
                         both the community dimension file and the 'HTML_CONTENT' file to 

trunk/ibisph-view/src/main/webapp/xslt/html/community/indicator/Page.xslt

@@ -7 +7 @@
         exclude-result-prefixes="ibis"
 >
-<!-- GARTH TODO: remove this entire XSLT page???  If not remove then decide what
+<!-- TODO: remove this entire XSLT page???  If not remove then decide what
         it should be...
+
+        THIS IS NOT A WORKING PAGE.  MUCH NEEDS TO BE DEFINED and IMPLEMENTED.
+        THIS IS SIMPLY LEFT HERE AS A STUBB FOR POSSIBLE FUTURE WORK.
 
 example it could simply be an trend IP report page for a specific community - 
@@ -30 +33 @@
                 <summary>Default core code that produces the  Community Indicator Profile view</summary>
                 <description>
+                        THIS IS NOT A WORKING PAGE.  MUCH NEEDS TO BE DEFINED and IMPLEMENTED.
+                        THIS IS SIMPLY LEFT HERE AS A STUBB FOR POSSIBLE FUTURE WORK.
+
                         Provides overridden Page API templates for the community profile Indicator report.
                 </description>

trunk/ibisph-view/src/main/webapp/xslt/html/community/initiatives/Page.xslt

@@ -16 +16 @@
                 <summary>Default core code that produces the Community Initiatives</summary>
                 <description>
+                        THIS IS NOT A WORKING PAGE.  MUCH NEEDS TO BE DEFINED and IMPLEMENTED.
+                        THIS IS SIMPLY LEFT HERE AS A STUBB FOR POSSIBLE FUTURE WORK.
+
                         Main page templates for the community profile initiatives list Report.
 

trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Indicator.xslt

@@ -21 +21 @@
 
         <!-- ==================== VARIABLES and PARAMETERS ===================== -->
+        <!-- NOTE: no file exists or try catch as want this to fail as it should never happen -->
         <xsl:param name="Indicator.indicator" select="
                         if(exists(/INDICATOR_VIEW))then
-                                document(concat(/INDICATOR_VIEW/INDICATOR_NAME, '.xml'), /)/INDICATOR
+                                document(/INDICATOR_VIEW/INDICATOR_NAME || '.xml', /)/INDICATOR
                         else 
                                 /INDICATOR
@@ -34 +35 @@
         <xsl:param name="Indicator.indicatorView" select="
                         if(exists(/INDICATOR))then
-                                document(concat(/INDICATOR/DEFAULT_INDICATOR_VIEW_NAME, '.xml'), /)/INDICATOR_VIEW
+                                document(/INDICATOR/DEFAULT_INDICATOR_VIEW_NAME || '.xml', /)/INDICATOR_VIEW
                         else 
                                 /INDICATOR_VIEW
@@ -691 +692 @@
                         </xsl:call-template>
                 </xsl:variable>
+                <!--
                 <xsl:copy-of select="$reourcesAndLinksHTMLContent/HTML_CONTENT/CONTENT/*"/>
+-->
         </xsl:template>
 

trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/complete_profile/Page.xslt

@@ -84 +84 @@
 
                         <xsl:for-each select="$indicator/INDICATOR_VIEWS/INDICATOR_VIEW/NAME">
-                                <xsl:variable name="indicatorView" select="document(concat(current(), '.xml'), /)/INDICATOR_VIEW"/>
+                                <!-- NOTE: no try catch for missing file - want this to fail as it should never happen -->
+                                <xsl:variable name="indicatorView" select="document(current() || '.xml', /)/INDICATOR_VIEW"/>
+
                                 <xsl:variable name="measure"       select="if($Indicator.useExternalXML) then $Measures/MEASURES/MEASURE[NAME=$indicatorView/MEASURE_NAME] else $indicator/MEASURES/MEASURE[NAME=$indicatorView/MEASURE_NAME]"/>
                                 <xsl:variable name="measureValueType" select="($Indicator.valueTypes/VALUE_TYPE[NAME = $measure/VALUE_TYPE_NAME])[1]"/>

trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/summary/Page.xslt

@@ -46 +46 @@
 
                         <xsl:for-each select="$indicator/INDICATOR_VIEWS/INDICATOR_VIEW/NAME">
-                                <xsl:variable name="indicatorView" select="document(concat(current(), '.xml'), /)/INDICATOR_VIEW"/>
+                                <!-- NOTE: no try catch for missing file - want this to fail as it should never happen -->
+                                <xsl:variable name="indicatorView" select="document(current() || '.xml', /)/INDICATOR_VIEW"/>
+
                                 <xsl:variable name="measure"       select="if($Indicator.useExternalXML) then $Measures/MEASURES/MEASURE[NAME=$indicatorView/MEASURE_NAME] else $indicator/MEASURES/MEASURE[NAME=$indicatorView/MEASURE_NAME]"/>
                                 <xsl:variable name="measureValueType"                   select="($Indicator.valueTypes/VALUE_TYPE[NAME = $measure/VALUE_TYPE_NAME])[1]"/>

trunk/ibisph-view/src/main/webapp/xslt/html/query/module/report/configurations_by_file.xslt

@@ -99 +99 @@
         <xsl:template name="processFile">
                 <xsl:param name="filename"/>
-                <xsl:param name="file"        select="document(concat($SiteSpecific.filePath, $filename), /)"/>
+                <xsl:param name="file"        select="document($SiteSpecific.filePath || $filename, /)"/>
                 <xsl:param name="configCount" select="count($file/QUERY_MODULE/CONFIGURATIONS/CONFIGURATION)"/>
 

trunk/ibisph-view/src/main/webapp/xslt/ibis.xslt

@@ -59 +59 @@
                         See: https://stackoverflow.com/questions/3854345/xpath-test-if-node-value-is-number
                         for number() = NaN which is unique and is not the same as another NaN.
+
+                        castable does NOT work as blank values return TRUE.
+                        <xsl:sequence select="$value castable as xs:double"/>
                 -->
                 <xsl:param name="value" ibis:doc="Source value to be tested"/>
+
                 <xsl:sequence select="number($value) = number($value)"/>
         </xsl:function>

trunk/ibisph-view/src/main/webapp/xslt/json/IndicatorViewDataset.xslt

@@ -32 +32 @@
         <xsl:param name="indicator" select="
                         if(exists(/INDICATOR_VIEW))then
-                                document(concat(/INDICATOR_VIEW/INDICATOR_NAME, '.xml'), /)/INDICATOR
+                                document(/INDICATOR_VIEW/INDICATOR_NAME || '.xml', /)/INDICATOR
                         else 
                                 /INDICATOR
@@ -53 +53 @@
         <xsl:param name="indicatorView" select="
                         if(exists(/INDICATOR))then
-                                document(concat(/INDICATOR/DEFAULT_INDICATOR_VIEW_NAME, '.xml'), /)/INDICATOR_VIEW
+                                document(/INDICATOR/DEFAULT_INDICATOR_VIEW_NAME || '.xml', /)/INDICATOR_VIEW
                         else 
                                 /INDICATOR_VIEW

trunk/ibisph-view/src/main/webapp/xslt/xml/Initiative.xslt

@@ -13 +13 @@
                 <description>
                         Main page templates for the community profile initiatives list Report.
+
+THIS IS NOT A WORKING XSLT.  MUCH NEEDS TO BE DEFINED and IMPLEMENTED.
+THIS IS SIMPLY LEFT HERE AS A STUBB FOR POSSIBLE FUTURE WORK.
 
                         BY COMMUNITY - PICK COMMUNITY THEN LOOP ALL INITATIVES