twb 3.7.5 → 3.9.3

data/lib/twb/analysis/CalculatedFields/MarkdownEmitter.rb

@@ -20,14 +20,17 @@ module Analysis
 module CalculatedFields
 
   class MarkdownEmitter
+    include TabTool
 
     attr_reader :docFileName
 
     def initialize
-      #@docFile.puts ""
+      init
+      @funcdoc = {:class=>self.class, :blurb=>'Generate Markdown doc for Calculated Fields.', :description=>'Creates a Markdown file documenting the Calculated Fields for an individual Workbook.',}
+      @metrics = {}
     end
 
-    def processTwb twb
+    def processTWB twb
       # twb = File.basename(twb)
       @twb = twb #Twb::Workbook.new twb
       @docFileName = './ttdoc/' + @twb.name + '.CalculatedFields.md'
@@ -35,8 +38,6 @@ module CalculatedFields
       @docFile.puts "# #{twb.name}"
       dsNames = @twb.datasourceUINames
       @docFile.puts "#{dsNames.length} Data Sources"
-      
-
       @twb.datasources.each do |ds|
         @docFile.puts "## #{ds.uiname}"
         @docFile.puts "__has #{ds.calculatedFields.length} calculated fields__\n "
@@ -77,6 +78,7 @@ module CalculatedFields
         end
         @docFile.puts "counted #{cnt} calculated fields\n "
       end  # twb.datasources.each
+      finis
     end    # def processTwb twb
 
   end # class MarkdownEmitter

data/lib/twb/analysis/CalculatedFields/groupfieldsanalyzer.rb

@@ -0,0 +1,93 @@
+#  sheetfieldsanalyzer.rb Copyright (C) 2018  Chris Gerrard
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.  
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'twb'
+require 'csv'
+
+module Twb
+module Analysis
+
+  class GroupFieldsAnalyzer
+
+    include TabTool
+
+    attr_accessor :localEmit
+
+    def initialize
+      init
+      @funcdoc     = {:class=>self.class, :blurb=>'Analyze Group Fields.', :description=>'Identifies the Groups and their Members for grouped fields.',}
+      #--
+      docFileName  = docFile('TwbGroupFields.csv')
+      @csv         = CSV.open(docFileName,'w')
+      @csv        << ['Workbook','Data Source','Field','Group','Member']
+      addDocFile docFileName, "Workbooks, Data Sources, and their Grouped Fields"
+      #--
+      @twbCount    = 0
+      @dsCount     = 0
+      @gfCount     = 0
+      @gfmCount    = 0
+    end
+
+    def metrics
+      {
+        '# of Workbooks'           => @twbCount,
+        '# of Data Sources'        => @dsCount,
+        '# of Group Fields'        => @gfCount,
+        '# of Group Field Members' => @gfmCount
+      }
+    end
+
+    def processTWB twb
+       @twb     = twb
+       @twbName = @twb.name
+       emit "   -- #{@twbName}"
+       @twbCount += 1
+       initMarkdown
+       parseDataSources
+       finis
+       $mdFile.close unless $mdFile.nil?
+    end
+
+    def initMarkdown
+      $mdFile = File.open(docFile("#{@twbName}.GroupFields.md"), 'w')
+      $mdFile << "# #{@twbName}\n "
+    end
+
+    def parseDataSources
+      @twb.datasources.each do |ds|
+          $mdFile.puts "\n## #{ds.uiname}" 
+          @dsCount += 1
+          cfs = ds.calculatedFields
+          cfs.each do |cf|
+              if cf.isGroup
+                @gfCount += 1
+                $mdFile.puts "###  #{cf.name}"
+                cf.groupMembers.each do |lead,values|
+                    $mdFile.puts "* #{lead}"
+                    values.each do |v|
+                      @gfmCount += 1
+                        $mdFile.puts "    >  #{v}"
+                        @csv << [@twbName, ds.uiname,cf.uiname,lead,v]
+                    end
+                end
+              end
+          end
+      end
+    end
+
+  end #class SheetFieldsAnalyzer
+
+end # module Analysis
+end # module Twb

data/lib/twb/analysis/DataSources/googlesheetdatasourcesanalyzer.rb

@@ -31,12 +31,8 @@ module Analysis
       #-- set up metrics
       @twbcount   = 0
       @dscount    = 0
+      @filecount  = 0
       @sheetcount = 0
-      @metrics    = {
-                      '# of Workbooks'   => @twbcount  ,
-                      '# of Worksheets'  => @dscount   ,
-                      '# of Worksheets'  => @sheetcount
-                    }
       #--
       @funcdoc    = {:class=>self.class, :blurb=>'Analyzing Google Sheet Data Sources from Tableau Workbooks.', :description=>nil,}
       docFileName = docFile('TWBGoogleSheetDataSources.csv')
@@ -57,16 +53,19 @@ module Analysis
       dss        = twb.datasources
       dss.each do |ds|
           emit ds.uiname
+          @dscount += 1
           conns = ds.node.xpath(".//connection[@class='google-sheets']")
           if conns.length > 0
-              @relation = ds.node.at_xpath('./connection/relation')
-              @relName  = @relation.attribute('name').text
-              @relType  = @relation.attribute('type').text
-              @fileName = ds.node.at_xpath('.//named-connection/connection').attribute('filename')
+              @relation   = ds.node.at_xpath('./connection/relation')
+              @relName    = @relation.attribute('name').text
+              @relType    = @relation.attribute('type').text
+              @fileName   = ds.node.at_xpath('.//named-connection/connection').attribute('filename')
+              @filecount += 1
               emit "FILENAME: #{@fileName}"
               tables = ds.node.xpath(".//relation[@type='table']")
               # emit "# Tables: #{tables.length}"
               tables.each do |table|
+                @sheetcount += 1
                 tableName = table.attribute('name')
                 columns   = table.xpath('.//column')
                 columns.each do |column|
@@ -78,6 +77,16 @@ module Analysis
           end
           emit " "
       end
+      finis
+    end
+
+    def metrics
+      {
+        '# of Workbooks'    => @twbcount,
+        '# of Data Sources' => @dscount,
+        '# of Google Docs'  => @filecount,
+        '# of Worksheets'   => @sheetcount
+      }
     end
 
   end #class SheetFieldsAnalyzer

data/lib/twb/analysis/Sheets/analyzeDashboardSheets.rb

@@ -0,0 +1,50 @@
+#  analyzeSheetFields.rb Copyright (C) 2018  Chris Gerrard
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.  
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+system 'cls'
+
+require 'twb'
+
+$twbCount = 0
+
+$analyzer = Twb::Analysis::DashSheetsAnalyzer.new
+
+def processTwb twbName
+    twb = Twb::Workbook.new twbName
+    puts  "\t - #{twb.name}"
+    # --
+    $analyzer.processTWB twb
+    # --
+    $twbCount += 1
+end
+
+puts  "\n\n "
+puts  "  #{$analyzer.funcdoc[:class]}"
+puts  "  #{$analyzer.funcdoc[:blurb]}"
+puts  "\n "
+
+path = if ARGV.empty? then ['*.twb','*.twbx'] else ARGV[0] end
+puts  "  Processing Workbooks matching: '#{path}'\n "
+Dir.glob(path) { |twb| processTwb twb if twb =~ /twb[x]?$/ && twb !~ /dot[.]twb[x]?$/}
+
+puts  "\n "
+puts  "  Analysis complete, found: #{$twbCount} Workbooks"
+puts  "\n"
+
+$analyzer.docfilesdoc.each do |l| 
+  puts '  ' + l
+end
+
+puts  "\n\n  That's all, folks.\n "  

data/lib/twb/analysis/Sheets/dashsheetsanalyzer.rb

@@ -0,0 +1,75 @@
+#  sheetfieldsanalyzer.rb Copyright (C) 2018  Chris Gerrard
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.  
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'twb'
+require 'csv'
+
+module Twb
+module Analysis
+
+  class DashSheetsAnalyzer
+
+    include TabTool
+
+    attr_accessor :localEmit
+
+    def initialize
+      init
+      @funcdoc     = {:class=>self.class, :blurb=>'Analyze Dashboard Sheets from Tableau Workbooks.', :description=>'Identifies the Worksheets present in Dashboards.',}
+      #--
+      docFileName  = docFile('TwbDashboardSheets.csv')
+      @dashSheetsCSV  = CSV.open(docFileName,'w')
+      @dashSheetsCSV  << ['Workbook','Dashboard','Worksheet','Hidden','Visible']
+      addDocFile docFileName, "Workbooks, Dashboards, and Worksheets in the Dashboards"
+      #--
+      @twbCount    = 0
+      @dashCount   = 0
+      @sheetCount  = 0
+    end
+
+    def metrics
+      {
+        '# of Workbooks'  => @twbCount,
+        '# of Dashboards' => @dashCount,
+        '# of Worksheets' => @sheetCount
+      }
+    end
+
+    def processTWB twb
+       @twb     = twb
+       @twbName = @twb.name
+       emit "   -- #{@twbName}"
+       @twbCount += 1
+       parseDashes
+       finis
+    end
+
+    def parseDashes
+      @dashboards  = @twb.dashboards
+      @dashboards.each do |dash|
+        emit "DASH:: #{dash.name}"
+        @dashCount += 1
+        dash.worksheets.each do |sheet|
+          @sheetCount += 1
+          emit "SHEET: #{sheet.name}"
+          @dashSheetsCSV  << [@twbName, dash.name, sheet.name, sheet.hidden, sheet.visible ]
+        end
+      end
+    end
+
+  end #class SheetFieldsAnalyzer
+
+end # module Analysis
+end # module Twb

data/lib/twb/analysis/Sheets/sheetfieldsanalyzer.rb

@@ -26,14 +26,25 @@ module Analysis
     attr_accessor :localEmit
 
     def initialize
-      @twbCnt     = 0
-      @sheetCnt   = 0
-      @filterCnt  = 0
-      @funcdoc    = {:class=>self.class, :blurb=>'Analyzing Sheet Fields from Tableau Workbooks.', :description=>nil,}
-      docFileName = docFile('TWBWorksheetFields.csv')
+      init
+      @funcdoc    = {:class=>self.class, :blurb=>'Analyze Sheet Fields from Tableau Workbooks.', :description=>nil,}
+      #--
+      docFileName = docFile('TwbWorksheetFields.csv')
       @sheetFieldsCSV  = CSV.open(docFileName,'w')
       @sheetFieldsCSV  << ['Workbook','Worksheet','Data Source','Data Source (tech)','Field','Field (tech)']
-      addDocFile docFileName, "CSV File containing the data relating Workbooks,Worksheets, and the sheets' Data Sources and Fields"
+      addDocFile docFileName, "Workbooks, Worksheets, and the Sheets' Data Sources and Fields"
+      #--
+      @twbCnt     = 0
+      @sheetCnt   = 0
+      @fieldsCnt  = 0
+    end
+
+    def metrics
+      {
+        '# of Workbooks'         => @twbcount,
+        '# of Worksheets'        => @sheetCnt,
+        '# of Worksheet Fields'  => @fieldsCnt
+      }
     end
 
     def processTWB twb
@@ -42,11 +53,13 @@ module Analysis
        @twbCnt += 1
        @twbDomainsLoaded = false
        parseSheets
+       finis
     end
 
     def parseSheets
       @worksheets  = @twb.worksheets
       @worksheets.each do |sheet|
+        @sheetCnt += 1
         emit "SHEET: #{sheet.name}"
         showFields sheet unless sheet.datasourceFields.nil?
       end
@@ -64,6 +77,7 @@ module Analysis
         emit "        - #{ds.uiname}"
         emit "        : #{ds.class}"
         dsfields.each do |sheetField|
+           @fieldsCnt += 1
            emit "       f: #{sheetField}"
            emit "       c: #{sheetField.class}"
            fuiName = ds.fieldUIName sheetField #Fields[sheetField]

data/lib/twb/analysis/Sheets/sheetfiltersanalyzer.rb

@@ -15,7 +15,6 @@
 
 require 'twb'
 require 'csv'
-require 'set'
 
 module Twb
 module Analysis
@@ -27,20 +26,34 @@ module Analysis
     attr_accessor :localEmit
 
     def initialize
-      @twbCnt    = 0
-      @sheetCnt  = 0
-      @filterCnt = 0
-      # @ttlogfile       = File.new('./ttdoc/SheetFiltersAnalyzer.ttlog','w')
-      $sheetFieldsCSV  = CSV.open(docFile('TWBWorksheetFilters.csv')  ,'w')
-      $sheetFieldsCSV  << ['Workbook','Worksheet','Filter Type','Data Source','Field','Value','Alias', 'Alias?']
+      init
+      @funcdoc     = {:class=>self.class, :blurb=>'Analyze Worksheet filters.', :description=>'Documents Quick Filters and the values they employ, if any. Work in progess.',}
+      #--
+      docFileName  = docFile('TWBWorksheetFilters.csv')
+      $sheetFieldsCSV  = CSV.open( docFileName  ,'w')
+      $sheetFieldsCSV  << ['Workbook','Worksheet','Filter Type','Operation','Data Source','Field','Value','Alias', 'Alias?']
+      addDocFile docFileName, "Workbooks, Worksheets and the sheets' Quick Filters"
+      #--
+      @twbCount    = 0
+      @sheetCount  = 0
+      @filterCount = 0
+    end
+
+    def metrics
+      {
+        '# of Workbooks'         => @twbcount,
+        '# of Worksheets'        => @sheetCount,
+        '# of Worksheet Filters' => @filterCount
+      }
     end
 
     def processTWB twb
        @twb = twb
        emit "   -- #{@twb.name}"
-       @twbCnt += 1
+       @twbCount += 1
        @twbDomainsLoaded = false
        parseFilters
+       finis
     end
 
 
@@ -48,72 +61,230 @@ module Analysis
       @worksheets  = @twb.worksheets
       @worksheets.each do |sheet|
         emit "\n\nSHEET: #{sheet.name}"
-        @sheetCnt += 1
+        @sheetCount += 1
         filters = sheet.node.xpath('.//filter[@column]')
         filters.each do |filter|
+          @filterCount += 1
           emit "\nFILTER:\n#{filter}\n====="
-          fieldCode  = filter.attribute('column').text
-          codedField = Twb::CodedField.new(fieldCode) 
-          fieldTech  = codedField.name
-          srcTech    = codedField.dataSource
-          dataSource = @twb.datasource(srcTech)
-          @dsAliases = dataSource.aliases
-          field      = dataSource.fieldUIName fieldTech
-          emit "\n::  FIELD  :: #{field}   --  #{fieldTech}  --  #{codedField.rawCode}"
-          filterValues = collectFilterValues sheet, dataSource, field, filter
+          filterClass  = filter.attribute('class').text
+          fieldCode    = filter.attribute('column').text
+          codedField   = Twb::CodedField.new(fieldCode) 
+          fieldTech    = codedField.name
+          inexclude    = fieldTech =~ /^(Ex|In)clusions/
+          measureNames = ':Measure Names' == fieldTech
+          srcTech      = codedField.dataSource
+          dataSource   = @twb.datasource(srcTech)
+          @dsAliases   = dataSource.aliases
+          field        = measureNames || inexclude ? fieldTech : dataSource.field(fieldTech)
+          fieldName    = measureNames || inexclude ? fieldTech : dataSource.fieldUIName(fieldTech)
+          emit "\n::  FIELD  :: #{field} == #{fieldName}   --  #{fieldTech}  --  #{codedField.rawCode}"
+          emit "       filter class: #{filterClass}"
+          emit "         field code: #{fieldCode}"
+          emit "        coded field: #{codedField}"
+          emit "         field tech: #{fieldTech}"
+          emit "         field name: nil? #{fieldName.nil?}   #{fieldName}  "
+          emit "           src tech: #{srcTech}"
+          emit "       measureNames: #{measureNames}"
+          emit "              sheet: #{sheet.name}"
+          emit "               node: #{filter}"
+          emit "                 ds: #{dataSource.uiname}"
+          emit "              field: #{field}"
+          emit " "
+          aaa = case filterClass
+          when 'relative-date' then resolveRelativeDate(sheet, dataSource, fieldName, filter)
+          when 'quantitative'  then resolveQuantitative(sheet, dataSource, fieldName, filter)
+          when 'categorical'   then resolveCategoricalValues(sheet, dataSource, fieldName, filter, measureNames)
+          end
         end
       end
     end
 
-    def collectFilterValues sheet, dataSource, field, node
-      emit "collectFilterValues"
-      emit "              sheet: #{sheet.name}"
-      emit "                 ds: #{dataSource.uiname}"
-      emit "              field: #{field}"
-      emit "               node: #{node}"
-      emit " "
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='-1' include-future='true' include-null='false' last-period='-1' period-type='day' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='-1' include-future='true' include-null='false' last-period='-1' period-type='year' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='-1' include-future='true' include-null='false' last-period='0' period-type='year' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='-2' include-future='true' include-null='false' last-period='0' period-type='day' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='-2' include-future='true' include-null='false' last-period='0' period-type='year' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='-6' include-future='true' include-null='false' last-period='0' period-type='day' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='0' include-future='false' include-null='false' last-period='0' period-type='year' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='0' include-future='true' include-null='false' last-period='0' period-type='day' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='0' include-future='true' include-null='false' last-period='0' period-type='year' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='0' include-future='true' include-null='false' last-period='2' period-type='day' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='0' include-future='true' include-null='false' last-period='2' period-type='year' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='0' include-future='true' include-null='false' last-period='4' period-type='day' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='1' include-future='true' include-null='false' last-period='1' period-type='day' />
+    # filter class='relative-date' column='[Sample - Superstore].[none:Order Date:qk]' first-period='1' include-future='true' include-null='false' last-period='1' period-type='year' />
+    def resolveRelativeDate sheet, dataSource, field, node
+      emit "resolveRelativeDate"
+      operation   = 'Inclusive'
+      periodType  = node['period-type']
+      inclFuture  = node['include-future'] == 'true'
+      firstPeriod = node['first-period'].to_i
+      lastPeriod  = node['last-period'].to_i
+      sum        = firstPeriod + lastPeriod
+      prod       = firstPeriod * lastPeriod
+      periodTech = "#{periodType} : #{firstPeriod} -> #{lastPeriod}"
+      period     = periodTech
+      if sum == 0 && prod == 0
+        period = case periodType
+                   when 'day'  then "Today"
+                   else inclFuture ? "This #{periodType.capitalize}" : "#{periodType.capitalize} to date"
+                 end
+      elsif firstPeriod == lastPeriod
+         future = firstPeriod > 0
+         reln   = future ? 'Next' : 'Previous'
+         period = case periodType
+                    when 'day' then  future ? 'Tomorrow' : 'Yesterday' 
+                    else        "#{reln} #{periodType.capitalize}"
+                  end
+      else
+         span = lastPeriod - firstPeriod + 1
+         future = firstPeriod == 0 
+         reln   = future ? "Next" : "Last"
+         period = "#{reln} #{span} #{periodType.capitalize}s"
+      end
+      $sheetFieldsCSV << [ @twb.name, sheet.name, 'Relative Date',operation, dataSource.uiname, field, period, periodTech  ]
+    end
+
+        # <filter class='quantitative' column='[Sample - Superstore].[none:Profit:qk]' included-values='in-range'>
+        # <filter class='quantitative' column='[Sample - Superstore].[none:Profit:qk]' included-values='in-range'>
+        # <filter class='quantitative' column='[Sample - Superstore].[none:Profit:qk]' included-values='in-range'>
+        # <filter class='quantitative' column='[Sample - Superstore].[none:Profit:qk]' included-values='all' />
+        # <filter class='quantitative' column='[Sample - Superstore].[none:Profit:qk]' included-values='non-null' />
+        # <filter class='quantitative' column='[Sample - Superstore].[none:Profit:qk]' included-values='null' />
+    def resolveQuantitative sheet, dataSource, field, node 
+      emit "resolveQuantitative"
+      operation  = 'Inclusive'
+      inclValues = node['included-values']
+      values = if 'in-range' == inclValues
+                   quantRangeValues node
+               else
+                   "#{inclValues.capitalize} Values"
+               end
+      $sheetFieldsCSV << [ @twb.name, sheet.name, 'Range (row)',operation.capitalize, dataSource.uiname, field, values, inclValues  ]         
+    end
+
+    def quantRangeValues node
+      min  = node.at_xpath('min')
+      max  = node.at_xpath('max')
+      emit "min: nil? %-6s  val: %-s " % [min.nil?,min]
+      emit "max: nil? %-6s  val: %-s " % [max.nil?,max]
+      minrv  = parseRangeVal min unless min.nil?
+      maxrv  = parseRangeVal max unless max.nil?
+      mintxt = min.nil? ? '' : max.nil? ? "At least: #{minrv}" : "Range #{minrv}"
+      maxtxt = max.nil? ? '' : min.nil? ? "At most: #{maxrv}"  : " ... #{maxrv}"
+      emit   "#{mintxt} #{maxtxt}"
+      return "#{mintxt} #{maxtxt}"
+    end
+
+    def parseRangeVal node
+      return 'nil' if node.nil?
+      text = node.text 
+      if text.start_with?('#') 
+        return text.gsub(/^[#]|[#]$/,'') 
+      end
+      num = text.to_f
+      # num.negative? ? num.floor : num.ceil
+      result = if num < 0
+                 num.floor
+               else
+                 num.ceil
+               end
+      return result
+    end   
+
+    def resolveCategoricalValues sheet, dataSource, field, node, measureNames
+      emit "resolveCategoricalValues"
+      emit "measureNames: #{measureNames}"
       firstChild = node.at_xpath('./groupfilter')
       results = {}
+      #-- handling Inclusions & Exclusions, in-sheet pick-data filters
+      if field =~ /^(Ex|In)clusions/ 
+          enumerate  = firstChild['user:ui-enumeration']
+          operation  = enumerate.nil? ? 'Inclusive' : enumerate.capitalize
+          $sheetFieldsCSV << [ @twb.name, sheet.name, 'In-Sheet', operation, dataSource.uiname, field, '+++', '+++'  ]
+          return results
+      end
+      #-- 
       unless firstChild.nil?
           function   = firstChild.attribute('function').text
-          emit  "function: #{function}"
+          enumerate  = firstChild['user:ui-enumeration']
+          operation  = enumerate.nil? ? 'Inclusive' : enumerate.capitalize
+          emit  "function : #{function}"
+          emit  "enumerate: #{enumerate}"
+          emit  "operation: #{operation}"
           emit  node.to_s
           #-- single element filter
           if 'member'.eql? function
             emit  "HANDLING SINGLE MEMBER FILTER"
-            value  = firstChild.attribute('member').text.gsub(/^"|"$/,'') 
+            member = firstChild['member']
+            value  = measureNames ?  dataSource.fieldUIName(Twb::CodedField.new(member).name) : member.gsub(/^"|"$/,'') 
             alia   = dataSource.deAlias(field,value)
             emit  "value :%-25s =>  alias: %-s" % [value, alia]
-            $sheetFieldsCSV << [ @twb.name, sheet.name, 'single', dataSource.uiname, field, value, alia  ]
+            $sheetFieldsCSV << [ @twb.name, sheet.name, 'single', operation, dataSource.uiname, field, value, alia  ]
             return  {value => alia}
           end
+          #-- another single element filter
+          # <groupfilter function="level-members" level="[none:Business Line:nk]" user:ui-enumeration="all" user:ui-marker="enumerate"/>
+          # <filter class='categorical' column='[federated.1astm0q1hl2ydc1dyqhqq0igvxkp].[none:Business Line:nk]' context='true'>
+          #   <groupfilter function='level-members' 
+          #                level='[none:Business Line:nk]' 
+          #                user:ui-enumeration='all' 
+          #                user:ui-exclude='true' 
+          #                user:ui-marker='enumerate' />
+          # </filter>
+          # <filter class='categorical' column='[federated.1astm0q1hl2ydc1dyqhqq0igvxkp].[none:Business Line:nk]' context='true'>
+          #   <groupfilter function='level-members' 
+          #                level='[none:Business Line:nk]' 
+          #                user:ui-enumeration='all' 
+          #                user:ui-marker='enumerate' />
+          # </filter>
+          if 'level-members'.eql? function
+            emit  "HANDLING level-members FILTER"
+            inclorexcl = firstChild.has_attribute?('user:ui-exclude') ? 'Exclusive' : 'Inclusive'
+            $sheetFieldsCSV << [ @twb.name, sheet.name, 'single', inclorexcl, dataSource.uiname, field, operation, enumerate  ]
+          end
           #-- otherwise filter contains multiple elements
           #-- handle individual member elements
           elements = firstChild.xpath('.//groupfilter')
           elements.each do |element|
             function = element.attribute('function').text
-            emit "firstCHild\nfunction: #{function}\n    node:\n#{element}"
+            emit "element function: #{function}\n    node:\n#{element}"
             if 'member'.eql? function
-              name  =  element.attribute('member').text.gsub(/^"|"$/,'')
-              emit "%%%% NAME:: #{name}"
+              member = element.attribute('member').text
+              name   = measureNames ? dataSource.fieldUIName(Twb::CodedField.new(member).name) : member.gsub(/^"|"$/,'')
+              emit "%%%% member NAME:: #{name}"
+              if '%null%' == name then name = 'Null' end
               alia  =  dataSource.fieldAlias(field,name) # $TableNameAliases[name]
               results[name] = alia
             end
             if 'range'.eql? function
+              emit "%%%% range element:: #{element}"
               t = filtersFromRangeNode(dataSource, field, element)
+
+              if t.empty?
+                from = element['from']
+                to   = element['to']
+                range = "#{from} ... #{to}"
+                results[range] = range
+              end 
+
               t.each do |name,alia|
-                emit "RANGE ELEMENT  Name: %-20s   ALIAS: %-s " % [name, alia]
+                emit "%%%% range Name: %-20s   ALIAS: %-s " % [name, alia]
                 results[name] = dataSource.fieldAlias(field,name)
               end
             end
           end
           results.each do |name,alia|
-            $sheetFieldsCSV << [ @twb.name, sheet.name, 'single', dataSource.uiname, field, name, alia, !name.eql?(alia) ]
+            $sheetFieldsCSV << [ @twb.name, sheet.name, 'single',operation, dataSource.uiname, field, name, alia, !name.eql?(alia) ]
           end
       end
       return results
     end
 
+    def processMeasureNames sheet, dataSource, field, node
+      emit 'processMeasureNames'
+    end
+
     def filtersFromRangeNode dataSource, field, node
       unless @twbDomainsLoaded
         loadDomains 
@@ -134,11 +305,11 @@ module Analysis
       dsFields  = @twbFielddomains[dataSource.uiname]
       emit  "dsFields    : #{dsFields}"
       if dsFields.nil? || dsFields.empty?
-          emit  "#### ALERT - FIELD DOMAIN VALUES FOR DATASOURCE #{dataSource.uiname} NOT LOADED ####"
-          emit  @twbFieldDomains
-          emit  "==========="
-          emit  dsFields
-          emit  "==========="
+          alert  "#### ALERT #### - '#{field}' FIELD DOMAIN VALUES FOR '#{@twb.name} DATASOURCE #{dataSource.uiname} NOT LOADED ####"
+          emit   @twbFieldDomains
+          emit   "==========="
+          emit   dsFields
+          emit   "==========="
       else
           fieldVals = dsFields[field].to_a
           if dataSource.fieldHasAliases field
@@ -191,23 +362,10 @@ module Analysis
       emit  "def loadDomains\n=="
       loader            = Twb::Util::FieldDomainLoader.new
       @twbFielddomains  = loader.loadWorkbook @twb
-      emit  "#{@twbFielddomains}\n=="
+      emit  "FIELD DOMAINS:: #{@twbFielddomains}\n=="
       @twbDomainsLoaded = true
     end
 
-      # def emit(local=@localEmit, stuff)
-      #     if stuff.is_a? String then
-      #       lines = stuff.split(/\n/)
-      #       lines.each do |line|
-      #         @ttlogfile.puts "#{$emitPrefix}#{line}"
-      #                    puts "#{$emitPrefix}#{line}" if local
-      #       end
-      #     else
-      #         @ttlogfile.puts "#{$emitPrefix}#{stuff}"
-      #                    puts "#{$emitPrefix}#{stuff}" if local
-      #     end
-      # end
-
 end # class 
 
 end # module Twb