Changeset 19940 in main

Timestamp:

03/03/20 10:34:02 (2 years ago)

Author:

GarthBraithwaite_STG

Message:

java view - Updated query module java and xslt to use the configuration/measure_name.

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/xslt/html/query/module/result/Result.xslt (modified) (1 diff)
• ibisph/src/main/java/org/ibisph/querymodule/modelmap/AddHTTPRequestParametersToQueryModule.java (modified) (1 diff)
• ibisph/src/main/java/org/ibisph/querymodule/modelmap/UpdateDisplayOptionsFromHTTPRequest.java (modified) (1 diff)
• ibisph/src/main/java/org/ibisph/querymodule/service/QueryModuleXML.java (modified) (2 diffs)

trunk/ibisph-view/src/main/webapp/xslt/html/query/module/result/Result.xslt

@@ -32 +32 @@
         <xsl:param name="Result.dimensions"      select="if($Result.useExternalXML) then $Dimensions/DIMENSIONS else $Result.queryModule/DIMENSIONS"/>
         <xsl:param name="Measures"/>
-        <xsl:param name="Result.measure"         select="if($Result.useExternalXML) then $Measures/MEASURES/MEASURE[NAME=$Result.queryModule/CONFIGURATIONS/CONFIGURATION/MEASURE_NAME] else $Result.queryModule/MEASURES/MEASURE[NAME=$Result.queryModule/CONFIGURATIONS/CONFIGURATION/MEASURE_NAME]"/>
+        <xsl:param name="Result.measure"         select="if($Result.useExternalXML) then $Measures/MEASURES/MEASURE[NAME=$Page.configuration/MEASURE_NAME] else $Result.queryModule/MEASURES/MEASURE[NAME=$Page.configuration/MEASURE_NAME]"/>
         <xsl:param name="ValueTypes"/>
         <xsl:param name="Result.valueTypes"      select="if($Result.useExternalXML) then $ValueTypes/VALUE_TYPES else $Result.queryModule/VALUE_TYPES"/>

trunk/ibisph/src/main/java/org/ibisph/querymodule/modelmap/AddHTTPRequestParametersToQueryModule.java

@@ -355 +355 @@
     }
 
-    // Set specified measure name.  If not specified then leave as is - default.
-    String measureName = null;
-    if(request != null) {
-      measureName = request.getParameter("MeasureName");
-      if(!StrLib.isSomething(measureName)) measureName = request.getParameter("_MeasureName");
-      if(StrLib.isSomething(measureName)) this.queryModuleService.setRequestMeasureName(queryModule, measureName);
-    }
-
-    // Do a similar thing for the chart/graph name.
+    // Set chart name.
     String chartName = null;
     if(request != null) {

trunk/ibisph/src/main/java/org/ibisph/querymodule/modelmap/UpdateDisplayOptionsFromHTTPRequest.java

@@ -53 +53 @@
     Node queryModule = (Node)modelMap.get(this.modelMapKey);
 
-    // Set specified measure name.  If not specified then leave as is - default.
-    String measureName = request.getParameter(this.measureParameterName);
-    this.queryModuleService.setRequestMeasureName(queryModule, measureName);
-
-    // Do a similar thing for the chart/graph name.
+    // Set the chart/graph name.
     String chartName = request.getParameter(this.chartParameterName);
     if(!StrLib.isSomething(chartName)) chartName = request.getParameter("chartName");

trunk/ibisph/src/main/java/org/ibisph/querymodule/service/QueryModuleXML.java

@@ -180 +180 @@
     }
 
-    // set the default measure
-    String measureName = XMLLib.getText(configuration, "DEFAULT_MEASURE_NAME");
-    if(!StrLib.isSomething(measureName)) measureName = XMLLib.getText(configuration, "MEASURES/MEASURE[not(NO_DISPLAY_FLAG)][1]/NAME");
-    setRequestMeasureName(document, measureName);
-
     // first check the config's param for a chart name.  If nothing use the
     // default.  If still nothing then try the qm's param.
@@ -369 +364 @@
 
   /**
-   * Sets the /QUERY_MODULE/REQUEST/MEASURE_NAME element's value. 
-   * @param queryModule
-   * @param measureName value to set.
-   */
-  public void setRequestMeasureName(Node queryModule, String measureName) {
-    if(StrLib.isSomething(measureName)) {
-      XMLLib.setText(
-        queryModule, 
-        "/QUERY_MODULE/REQUEST", 
-        "MEASURE_NAME", 
-        measureName
-      );
-    }
-  } //-------------------------- End of Method ------------------------------
-
-  /**
    * Gets the /QUERY_MODULE/REQUEST/CHART_NAME element's value. 
    * @param queryModule query module document to get text value from.