Changeset 19896 in main

Timestamp:

02/23/20 10:28:01 (2 years ago)

Author:

GarthBraithwaite_STG

Message:

java, admin - DataBeanToXMLService to trim string values. Changed the main favicon.ico to be the image/application.ico - just in case. Added xs: namespace to the ind.xslt - but likely won't use instance of for now. Added definition to summary/Page.xslt.

Location:

trunk

Files:

• ibisph-admin/src/main/webapp/WEB-INF/lib/ibisph-3.0.0.jar (modified) (previous)
• ibisph-view/src/main/webapp/WEB-INF/lib/ibisph-3.0.0.jar (modified) (previous)
• ibisph-view/src/main/webapp/favicon.ico (modified) (previous)
• ibisph-view/src/main/webapp/xslt/html/indicator/profile/Indicator.xslt (modified) (3 diffs)
• ibisph-view/src/main/webapp/xslt/html/indicator/profile/summary/Page.xslt (modified) (3 diffs)
• ibisph/src/main/java/org/ibisph/databean/DataBeanToXMLService.java (modified) (4 diffs)

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

@@ -2 +2 @@
 
 <xsl:stylesheet version="3.0" 
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
         xmlns:xsl ="http://www.w3.org/1999/XSL/Transform" 
         xmlns:ibis="http://www.ibisph.org"
@@ -144 +145 @@
                 />
                 <xsl:param name="titleLevel"  select="$Indicator.contentBlockTitleLevel"/>
+
+<!-- 
+<xsl:variable name="content" select="if($content instance of xs:string)then normalize-space($content) else $content"/>
+-->
 
 <xsl:variable name="additionalClasses">
@@ -1064 +1069 @@
                                                 <xsl:with-param name="addWikiAttribute" select="true()"/>
                                         </xsl:call-template>
-                                        <br/>
                                 </xsl:if>
-                        </div><br/>
+                        </div>
                 </xsl:if>
         </xsl:template>

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

@@ -54 +54 @@
                                 <xsl:variable name="indicatorView" select="document(concat(current(), '.xml'), /)/INDICATOR_VIEW"/>
                                 <xsl:variable name="measure"       select="if($Indicator.useExternalXML) then $Indicator.measure else $indicator/MEASURES/MEASURE[NAME=$indicatorView/MEASURE_NAME]"/>
+<!-- GARTH TODO: -->
 <xsl:message select="concat('view name: ', $indicatorView/NAME, ', position: ', position(), ', count: ', count($indicator/INDICATOR_VIEWS/INDICATOR_VIEW))"/>
                                 <xsl:variable name="showMap" ibis:doc="Exposed so that SS can access."
@@ -108 +109 @@
 <!--
                 <xsl:call-template name="Indicator.dataSources"/>
+                                <a href="{$ibis.baseRequestPath}indicator/view/{$indicatorView/NAME}.html"><xsl:value-of select="$indicatorView/TITLE"/> Details</a>
 -->
-                                <a href="{$ibis.baseRequestPath}indicator/view/{$indicatorView/NAME}.html"><xsl:value-of select="$indicatorView/TITLE"/> Details</a><br/><br/>
 
 
@@ -158 +159 @@
 
 
-                                <xsl:if test="position() != last()"><br/><br/></xsl:if>
+                                <xsl:if test="position() != last()"></xsl:if>
                         </xsl:for-each>
                 </xsl:if>
 
                 <xsl:call-template name="Indicator.whyImportant"/>
+                <xsl:call-template name="Indicator.definition"/>
                 <xsl:call-template name="Indicator.howCalculatedTable"/>
                 <xsl:call-template name="Indicator.howDoing"/>

trunk/ibisph/src/main/java/org/ibisph/databean/DataBeanToXMLService.java

@@ -118 +118 @@
     String[] fieldKey  = dataBean.getFieldKeys();  // might as well save non persistent as well just in case...
     String[] recordKey = dataBean.getRecordKeys();
-    String temp;
+    String stringValue;
     Node node;
 
@@ -142 +142 @@
         case DataBean.Field.TYPE_DATE:
           Date date = dataBean.getDateFieldValue(fieldKey[i]);
-          temp = "";
-          if(date != null) temp = this.dateFormat.format(date);
-          XMLLib.addNode(containerNode, XMLLib.newNode(fieldKey[i], temp) );
+          stringValue = "";
+          if(date != null) stringValue = this.dateFormat.format(date);
+          XMLLib.addNode(containerNode, XMLLib.newNode(fieldKey[i], stringValue) );
           break;
         case DataBean.Field.TYPE_BEAN:
@@ -159 +159 @@
               node = null;
               if(o instanceof String) {
-                temp = dataBean.getStringFieldValue(fieldKey[i]);
-                if(null != this.stringCleaner) temp = this.stringCleaner.getCleanedString(temp);
-                if((StrLib.isSomething(temp)) || this.isAddBlankValueElements) {
-                  node = XMLLib.newNode(xmlNodeName, temp);
+                stringValue = dataBean.getStringFieldValue(fieldKey[i]);
+                if(StrLib.isSomething(stringValue)) {
+                  stringValue = stringValue.trim();
+                  if(null != this.stringCleaner) stringValue = this.stringCleaner.getCleanedString(stringValue);
+                }
+                if((StrLib.isSomething(stringValue)) || this.isAddBlankValueElements) {
+                  node = XMLLib.newNode(xmlNodeName, stringValue);
                 }
               }
@@ -174 +177 @@
           break;
         default:
-          temp = dataBean.getStringFieldValue(fieldKey[i]);
-          if(null != this.stringCleaner) temp = this.stringCleaner.getCleanedString(temp);
-          if((StrLib.isSomething(temp)) || this.isAddBlankValueElements) {
-            XMLLib.addNode(containerNode, XMLLib.newNode(fieldKey[i], temp) );
+          stringValue = dataBean.getStringFieldValue(fieldKey[i]);
+          if(StrLib.isSomething(stringValue)) {
+            stringValue = stringValue.trim();
+            if(null != this.stringCleaner) stringValue = this.stringCleaner.getCleanedString(stringValue);
+          }
+          if((StrLib.isSomething(stringValue)) || this.isAddBlankValueElements) {
+            XMLLib.addNode(containerNode, XMLLib.newNode(fieldKey[i], stringValue) );
           }
       }