twb 2.2.1 → 3.7.2

data/lib/twb/connection.rb

@@ -0,0 +1,33 @@
+#  Copyright (C) 2014, 2015, 2016  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 'nokogiri'
+
+module Twb
+
+  class Connection < TabClass
+
+    attr_reader :xmlType
+
+    # node: XML element
+    def initialize node
+        @xmlType = node.type
+
+
+    end
+
+  end # class
+
+end # module Twb

data/lib/twb/dashboard.rb

@@ -18,7 +18,7 @@ require 'digest/md5'
 
 module Twb
 
-  class Dashboard
+  class Dashboard < TabClass
 
     @@hasher = Digest::SHA256.new
 
@@ -39,6 +39,10 @@ module Twb
       return self
     end
 
+    def id
+        @id ||= @id = @name.hash
+    end
+
     def loadSheets twbworksheets
       @sheets = {}
       dsheets = @node.xpath('.//zone[@name]').to_a

data/lib/twb/datasource.rb

@@ -19,7 +19,7 @@ require 'json'
 
 module Twb
 
-  class DataSource
+  class DataSource < TabClass
   
     @@hasher = Digest::SHA256.new
 
@@ -41,7 +41,7 @@ module Twb
     attr_reader :workbook
     attr_reader :name,          :caption,         :uiname
     attr_reader :dsclass,       :isExtract
-    attr_reader :connection,    :connHash
+    attr_reader :connection,    :connections,     :connHash,        :uuid
     attr_reader :tables,        :joinPairs      
     attr_reader :localFields,   :localFieldNames, :localField, :hasField 
     attr_reader :columnFields 
@@ -50,6 +50,7 @@ module Twb
     attr_reader :mappedFields
     attr_reader :tableFieldsMap
     attr_reader :fieldUINames
+    attr_reader :aliases
     attr_reader :calculatedFields, :calculatedFieldNamesMap, :calculatedFieldNames, :calculatedField 
     attr_reader :allFields 
     attr_reader :filters
@@ -61,12 +62,18 @@ module Twb
       @name     = @node.attr('name')
       @caption  = @node.attr('caption')
       @uiname   = @caption.nil? ? @name : @caption
+      # puts "DATASOURCE: #{@uiname}" 
       processConnection
       processFilters
       loadTableFields
+      loadFieldUINames
       return self
     end
 
+    def id
+        @id ||= @id = @name
+    end
+
     def tableauVersion tabVersion
       @tableauVersion = tabVersion
     end
@@ -75,6 +82,36 @@ module Twb
       @tableauVersion
     end
 
+    def connections
+      @connections ||= @connections = processConnections
+    end
+
+    def processConnections
+      processConnection ds, './/connection'
+      processConnection ds, './/named-connection'
+    end
+
+    def processConnection path
+        conns = @node.xpath(path)
+        conns.each do |connNode|
+            connClass = @dsclass
+            cpath     = conn.path
+            connPath  = cpath.gsub(/\[[0-9]+\]/,'')
+            connPNum  = /(\d+)/.match(cpath)
+            # puts cpath, connPath
+            # puts "CPATH: #{cpath}"
+            conn.attributes.each do |name,value|
+                # puts  "\n\t\t - %-15s -> %-s" % [name, value]
+                $csvFile << [ $recCount += 1,
+                              $twbName,  $dir,     $build,    $version,
+                              $dsName,   $dstype,  $dsuiname, connClass, 
+                              connPath,  connPNum,
+                              name,      value.value
+                            ]
+            end
+        end
+    end
+
     def processConnection
       @connection  = @node.at_xpath('./connection')
       @dsclass     = @name  # handles 'Parameters' data source, which has no connection element (& others if so)  
@@ -98,6 +135,7 @@ module Twb
         dsConnStr += attr.text
       end
       @connHash = Digest::MD5.hexdigest(dsConnStr)
+      @uuid = @connHash
     end
 
     def isExtract
@@ -133,16 +171,16 @@ module Twb
 
     def loadJoinTree
       loadJoinPairs if @joinPairs.nil?
-      # puts "LJT::#{@uiname}::joinPairs:: #{@joinPairs.inspect}"
-      # @joinPairs.each { |jp| puts "JP::#{jp}" }
+      # puts  "LJT::#{@uiname}::joinPairs:: #{@joinPairs.inspect}"
+      # @joinPairs.each { |jp| # puts "JP::#{jp}" }
       @joinTree = JoinTree.new(@name)
       @joinPairs.each do |from,to|
-        # puts "from:#{from} -> to:#{to}"
+        # puts  "from:#{from} -> to:#{to}"
         tableFrom = JoinTable.new(from)
         tableTo   = JoinTable.new(to)
         @joinTree.add(tableFrom, tableTo)
       end
-      # puts '---'
+      # puts  '---'
       return @joinTree
     end
 
@@ -156,7 +194,7 @@ module Twb
     end
 
     def columnFields
-      @columnFields ||= loadColumnFields
+      @columnFields ||= @columnFields = loadColumnFields
     end
 
     def columnFieldsMap
@@ -172,10 +210,71 @@ module Twb
         field = Twb::ColumnField.new n, self
         @columnFields << field
         @columnFieldsMap[field.uiname] = field
+        @columnFieldsMap[field.name]   = field
       end
       return @columnFields
     end 
 
+    def aliases
+      @aliases ||= loadAliases
+    end
+
+    def loadAliases
+      @aliases   = {}
+      # puts $node.xpath('.//column/aliases/..').length
+      @node.xpath('./column//aliases/..').each do |anode|
+        # puts "anode:: #{anode}"
+        # puts " path:: #{anode.path}"
+        aliasMap = {}
+        nameTech = anode.attribute('name').text.gsub(/^\[|\]$/,'')
+        name     = fieldUIName nameTech
+        if ':Measure Names'.eql? name
+          # puts "processing Measure Names"
+          anode.xpath('.//alias').each do |vnode|
+            keyCode  = vnode.attribute('key').text.gsub(/^[#"%]|[#"%]$/,'')
+            key      = Twb::CodedField.new(keyCode).name
+            field    = fieldUIName key
+            alia     = vnode.attribute('value').text
+            # puts "  keyCode:: #{key}"
+            # puts "  key    :: #{key}"
+            # puts "  field  :: #{field}"
+            # puts "  alias  :: #{alia}"
+            aliasMap[field] = alia
+          end
+        else
+          anode.xpath('.//alias').each do |vnode|
+            key  = vnode.attribute('key').text.gsub(/^[#"]|[#"]$/,'')
+            alia = vnode.attribute('value').text
+            # puts " key :: #{key}"
+            # puts "alias:: #{alia}"
+            aliasMap[key] = alia
+          end
+        end
+        @aliases[name] = aliasMap
+      end
+      return @aliases
+    end
+
+    def fieldHasAliases fieldName
+      !aliases[fieldName].nil?
+    end
+
+    def fieldAliases fieldName
+      aliases[fieldName]
+    end
+
+    def fieldAlias fieldName, value
+      return value unless fieldHasAliases(fieldName)
+      fldAlias = aliases[fieldName][value]
+      fldAlias.nil? ? value : fldAlias
+    end
+
+    def deAlias fieldName, fAlias
+      fldAliases = aliases[fieldName]
+      return fAlias if fldAliases.nil?
+      dbFieldValue = fldAliases.key(fAlias)
+      dbFieldValue.nil? ? fAlias : dbFieldValue
+    end
 
     def localFields
       @localFields ||= loadLocalFields
@@ -241,21 +340,33 @@ module Twb
     end
 
     def loadFieldUINames
+      # puts 'loadFieldUINames'
       @fieldUINames = {}
+      # puts 'metadataFields'
       metadataFields.each do |fld|
-        unless fld.localName.nil?
-          @fieldUINames[fld.localName] = fld.uiname
-          @fieldUINames[fld.uiname]    = fld.uiname
-        end
+        # puts " - name:%-45s   |  uiname:%-45s   |  localName:%-45s " % [ "'#{fld.name}'", "'#{fld.uiname}'", "'#{fld.localName}'"]
+        @fieldUINames[fld.uiname]    = fld.uiname
+        @fieldUINames[fld.localName] = fld.uiname unless  fld.localName.nil?
+        @fieldUINames[fld.name]      = fld.uiname unless  fld.name.nil?
       end
+      # puts 'calculatedFields'
       calculatedFields.each do |fld| 
+        # puts " - name:%-45s   |  uiname:%-45s " % [ "'#{fld.name}'", "'#{fld.uiname}'"]
         @fieldUINames[fld.name]   = fld.uiname
         @fieldUINames[fld.uiname] = fld.uiname
       end
-      localFields.each do |fld| 
+      # puts 'localFields'
+      localFields.each do |fld|
+        # puts " - name:%-45s   |  uiname:%-45s " % [ "'#{fld.name}'", "'#{fld.uiname}'"]
         @fieldUINames[fld.name]   = fld.uiname
         @fieldUINames[fld.uiname] = fld.uiname
       end
+      # puts "columnFields: #{columnFields.length}"
+      columnFields.each do |fld|
+        @fieldUINames[fld.name]   = fld.uiname
+        @fieldUINames[fld.uiname] = fld.uiname
+      end
+      return @fieldUINames
     end
 
     def tableFields
@@ -329,7 +440,7 @@ module Twb
 
     # fields are unique in the data source by UI name
     def loadTableFields
-      # puts "DATA SOURCE FIELD TABLE LOAD"
+      # puts  "DATA SOURCE FIELD TABLE LOAD"
       @tableFieldsMap = {}
       fieldNodes = @node.xpath('./connection/cols/map')
       fieldNodes.each do |fn|
@@ -410,10 +521,10 @@ module Twb
     end
 
     def addChild child
-      # puts "#{@name}.addChild(#{child.name})"
-      # puts "children: #{@children}"
+      # puts  "#{@name}.addChild(#{child.name})"
+      # puts  "children: #{@children}"
       @children[child.name] = child if @children[child.name].nil?
-      # puts "children: #{@children}"
+      # puts  "children: #{@children}"
     end
 
     def child name
@@ -435,8 +546,8 @@ module Twb
     end
 
     def add host, dest
-      # puts "\nJT add() host: #{host}"
-      # puts "           dest: #{dest}"
+      # puts  "\nJT add() host: #{host}"
+      # puts  "           dest: #{dest}"
       from = @tables[host.name].nil? ? host : @tables[host.name]
       to   = @tables[dest.name].nil? ? dest : @tables[dest.name]
       from.addChild(to)
@@ -453,7 +564,7 @@ module Twb
     end
 
     def setDepth table, depth
-      # puts "-- setDepth(#{table.class}[#{table.name}] \t, #{depth})"
+      # puts  "-- setDepth(#{table.class}[#{table.name}] \t, #{depth})"
       @tables[table.name].depth = depth
       childrenDepth = depth+1
       table.children.each { |n,c| setDepth(c,childrenDepth)}
@@ -464,7 +575,7 @@ module Twb
     end
 
     def disp table
-      puts "%s %s %s  (%d)" % [' ' * table.depth, '-' * table.depth, table.name, table.depth]
+      # puts  "%s %s %s  (%d)" % [' ' * table.depth, '-' * table.depth, table.name, table.depth]
       table.children.each { |n,c| disp c}
     end
 

data/lib/twb/dbfield.rb

@@ -47,6 +47,10 @@ module Twb
       @id      = "#{dataSource}::#{dbname}::#{dbtable}::#{uiname}"
     end
 
+    def id
+        @id ||= @id = @name.hash
+    end
+
     def properties
       @properties ||= loadProperties
     end

data/lib/twb/field.rb

@@ -17,7 +17,7 @@ require 'nokogiri'
 
 module Twb
 
-  class Field
+  class Field < TabClass
 
     attr_reader :node, :name, :datatype, :role, :type, :hidden, :caption, :aggregation, :uiname
 
@@ -35,6 +35,10 @@ module Twb
       return self
     end
 
+    def id
+        @id ||= @id = @name.hash
+    end
+
   end
 
 end

data/lib/twb/fieldcalculation.rb

@@ -1,4 +1,4 @@
-#  Copyright (C) 2014, 2015, 2017  Chris Gerrard
+  #  Copyright (C) 2014, 2015, 2017  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
@@ -14,13 +14,17 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'nokogiri'
+require 'digest/md5'
+require 'csv'
 
 module Twb
 
-  class FieldCalculation
+  class FieldCalculation  < TabClass
 
-    attr_reader :node,       :field,    :fieldNode,  :dataSource
-    attr_reader :uiname,     :techname, :caption
+    include TabTool
+
+    attr_reader :node,   :field,   :fieldNode,  :dataSource
+    attr_reader :name,   :caption, :uiname
     attr_reader :has_formula
     attr_reader :formula         
     attr_reader :formulaUC
@@ -29,10 +33,12 @@ module Twb
     attr_reader :formulaFlatResolved
     attr_reader :formulaLines, :formulaResolvedLines 
     attr_reader :is_tableCalc
-    attr_reader :is_lod,  :lodCodePos
-    attr_reader :class,   :scopeIsolation
-    attr_reader :fields,  :remoteFields,  :calcFields
-    attr_reader :comments
+    attr_reader :is_lod,   :lodCodePos
+    attr_reader :class,    :scopeIsolation
+    attr_reader :fields,   :remoteFields,  :calcFields
+    attr_reader :comments, :uuid
+
+    attr_accessor :ttlogfile
 
     @@tableCalcs = [ 'FIRST',        'INDEX', 'LAST', 'SIZE',
                      'LOOKUP',       'PREVIOUS_VALUE',
@@ -47,11 +53,15 @@ module Twb
                      'WINDOW_VAR',   'WINDOW_VARP'
                    ]
 
+    @ttlogfile = 
+
     def initialize(calcField, datasource=nil)
       raise ArgumentError.new("FieldCalculation must be initialized with a CalculatedField, has been provided with a #{calcField.class}") if calcField.class != Twb::CalculatedField
-      @field = calcField
-      calcNode = calcField.node
-      @istableCalc = false
+      # initLogger
+      @field        = calcField
+      calcNode      = calcField.node
+      @istableCalc  = false
+      # @localEmit    = false
       # puts "FieldCalculation calcNode.nil? :: #{calcNode.nil?} "
       unless calcNode.nil?
         @node         = calcNode.at_xpath('./calculation')
@@ -60,27 +70,23 @@ module Twb
         @class        = attribText(@node, 'class')
         @remoteFields = {}
         if 'categorical-bin'.eql? @class
-          # <calculation class='categorical-bin' 
-          #              column='[Calculation_507569757376950272]' 
-          #              default='&quot;Other&quot;' 
-          #              new-bin='true'>
-          @techname  = @node.attribute('column').text.gsub(/^\[|\]$/,'')   # assumes the column attribute exists
+          @name      = @node.attribute('column').text.gsub(/^\[|\]$/,'')   # assumes the column attribute exists
           @caption   = attribText(@fieldNode, 'caption')
           uiname     = if datasource.nil?
-                          @techName
+                          @name
                        else
-                          datasource.fieldUIName(@techname)
+                          datasource.fieldUIName(@name)
                        end
-          @uiname    = "#{uiname} <<group>>"
+          @uiname       = "#{uiname} <<group>>"
           @has_formula  = true
-          @formula      = "grouped <<#{uiname}>> values"
+          @formula      = "grouped <<[#{uiname}]>> values"
           @formulaLines = [ @formula ] 
           @formulaFlat  = @formula 
           @comments     = [ ]
           @is_lod       = false
         else
           @caption   = calcField.caption
-          @techname  = calcField.name
+          @name      = calcField.name
           @uiname    = calcField.uiname
           #--
           @scopeIsolation = attribText(@node, 'scope-isolation') 
@@ -88,6 +94,7 @@ module Twb
           @has_formula    = @node.has_attribute?('formula')
           if @has_formula
             @formula      = @node.attribute('formula').text.gsub(/\r\n/,"\n")
+            # puts "\n-- init: #{@formula}"
             @formulaUC    = @formula.upcase
             @formulaLines = formula.split(/\n|\r\n/)
             @formulaFlat  = flattenFormula(@formulaLines)
@@ -101,6 +108,20 @@ module Twb
       end
     end
 
+    # def initLogger(logfile=nil)
+    #   logfilename   = docFile(logfile.nil? ? @ttlogfile : logfile)
+    #   @logger       = Logger.new(logfilename)
+    #   @logger.level = Logger::DEBUG
+    # end
+
+    def id
+        @id ||= @id = @formulaFlat.hash + calcField.hash
+    end
+
+    def uuid
+      @uuid ||= @uuid = Digest::MD5.hexdigest(@formula)
+    end
+
     # def assessTableCalc formula
     #   @@tableCalcs.any? { |tc| string.include?(tc) }
     # end
@@ -109,36 +130,14 @@ module Twb
       node.attribute(attribute).nil? ? nil : node.attribute(attribute).text
     end
 
-
-    def parseFormFields
-      @fields     = Set.new []
-      @calcFields = SortedSet.new []
-      formula = @formulaFlat
-      if !formula.nil? && formula.include?('[') && formula.include?(']')
-          noSqLits =  formula.gsub( /'[\[\.\]]+'/, ' ')
-          flatForm = noSqLits.gsub( /\n/, ' ')
-          stripFrt = flatForm.gsub( /^[^\[]*[\[]/    , '['      )
-          stripBck = stripFrt.gsub( /\][^\]]+$/      , ']'      )
-          stripMid = stripBck.gsub( /\][^\]]{2,}\[/  , ']]..[[' )
-          stripCom = stripMid.gsub( /\][ ]*,[ ]*\[/  , ']]..[[' )
-          stripFns = stripMid.gsub( /\][ ]*[\*\/+\-><,=][ ]*\[/  , ']]..[[' )
-          fields   = stripFns.split(']..[')
-          fields.each { |field| @fields.add field.gsub(/^\[|\]$/, '')}
-          fields.each do |field| 
-            cf = CalculationField.new( field.gsub(/^\[|\]$/, ''), @dataSource, @dataSource.workbook )
-            @calcFields.add cf
-          end
-      end
-    end
-
     def formulaResolved
-      @formulaResolved ||= resolveFormula
+      @formulaResolved ||= @formulaResolved = resolveFormula
     end
     
     def resolveFormula
+      # puts "\ndef resolveFormula:\n--\n#{@formula}"
       formula = @formula
       parseFormFields # - extracts the fields from the formula; as persisted they're the internal names
-     # puts "::++ #{formula}"
       @calcFields.each do |calcField|
         if calcField.techUIdiff
          # puts ":::: #{calcField.techCode}  //  #{calcField.uiCode}"
@@ -149,7 +148,42 @@ module Twb
       return formula
     end
 
+    def calcFields
+      @calcFields ||= parseFormFields
+    end
+
+    def parseFormFields
+      # puts "--parseFormFields"
+      @fields     = Set.new    
+      @calcFields = Set.new
+      formula = @formulaFlat
+      if !formula.nil? && formula.include?('[') && formula.include?(']')
+          fields   = Set.new
+          # noSqLits =  formula.gsub( /'[\[\.\]]+'/, ' ')
+          quotes   =  formula.gsub('"',"'")
+          noSqLits =   quotes.gsub( /'[\[\.\]]+'/, ' ')
+          flatForm = noSqLits.gsub( /\n/, ' ')
+          stripFrt = flatForm.gsub( /^[^\[]*[\[]/    , '['      )
+          stripBck = stripFrt.gsub( /\][^\]]+$/      , ']'      )
+          stripMid = stripBck.gsub( /\][^\]]{2,}\[/  , ']]..[[' )
+          stripCom = stripMid.gsub( /\][ ]*,[ ]*\[/  , ']]..[[' )
+          stripFns = stripMid.gsub( /\][ ]*[\*\/+\-><,=][ ]*\[/  , ']]..[[' )
+          fields   = stripFns.split(']..[')
+          emit "::self::: #{self} :: #{__LINE__} :: fields:'#{fields.inspect}'" 
+          fields.each do |field|
+            emit "::self::: #{self} :: #{__LINE__} :: field:'#{field}'" 
+            cf = CalculationField.new( field.gsub(/^\[|\]$/, ''), @dataSource )
+            @calcFields.add cf
+            @fields.add field.gsub(/^\[|\]$/, '')
+          end
+      end
+      return @calcFields
+    end
+
     def formulaResolvedLines
+      # puts "\ndef formulaResolvedLines\n--\n#{formulaResolved}"
+      # puts "--\n#{formulaResolved.split(/\n|\r\n/)}"
+      # puts "--\n#{formulaResolved.split(/\n|\r\n/)}"
       formulaResolved.split(/\n|\r\n/)
     end
 
@@ -162,16 +196,16 @@ module Twb
 
     def flattenResolvedFormula
       formula = formulaResolved
-      formula.gsub(/\n/, '  ')
+      formula.gsub(/\n/, ' ')
     end
 
     def flattenFormula lines
       formula = ''
       lines.each do |line|
-          line.strip
+          # line.strip
           formula += ' ' + line.gsub(/\/\/.*/, '') # unless line =~ /^[ ]*\/\//
       end
-      return formula.strip
+      return formula # .strip
     end
 
      
@@ -190,71 +224,93 @@ module Twb
 
 
   class CalculationField
-    # is a field used in a calculation, resolved into it's human-meaningful form
+    # is a field used in a calculation, resolved into its human-meaningful form
 
     include Comparable
+    include TabTool
 
-    attr_reader :techName,      :techCode     
-    attr_reader :uiName,        :uiCode 
-    attr_reader :dataSource,    :dataSourceRef, :dataSourceExists
-    attr_reader :fqName
+    attr_reader :name,       :techCode     
+    attr_reader :uiname,     :uiCode 
+    attr_reader :dataSource, :dataSourceName, :dataSourceRef, :dataSourceExists
+    attr_reader :fqName,     :type
     attr_reader :techUIdiff
 
-    def initialize code, datasource, workbook
-     # puts "\nCalculationField <= \n\t  #{code}"
-      @dataSource       = datasource.uiname
+    def initialize code, datasource
+      # puts "\n\nCalculationField ::  %-25s  |  %s  " % [datasource.uiname, code]
+      @dataSource       = datasource
+      @dataSourceName   = datasource.uiname
       @dataSourceRef    = :local
       @dataSourceExists = true
       @techUIdiff       = false
-      @uiName           = ''
+      @uiname           = ''
       rawCode  = code.gsub(/^\[|\]$/,'')
       parts    = rawCode.split('].[')
-      # puts "\n\nField: #{code}  \t parts: #{parts.length} - #{parts.inspect}"
+      #puts "Field: #{code}  \t parts: #{parts.length} - #{parts.inspect}"
       if parts.length == 1
-        @techName = parts[0]
+        @name = parts[0]
         @techCode = "[#{parts[0]}]"
+        #puts "@name: #{@name}"
         if datasource.nil?
-          @uiName = @techName
+          # puts 'a'
+          @uiname = @name
           @uiCode = @techCode
           @techUIdiff = false
         else # !datasource.nil?
-          # puts "#{@techName} \t:: #{datasource.fieldUIName(@techName).nil?} \t:: #{datasource.fieldUIName(@techName)} "
-          @uiName = datasource.fieldUIName(@techName).nil? ? @techName : datasource.fieldUIName(@techName) 
-          @uiCode = @uiName.nil? ? @techCode :  "[#{@uiName}]"
+          # puts 'b'
+          #puts "b - found uiname for '#{@name}'?: #{!datasource.fieldUIName(@name).nil?} \t is:#{datasource.fieldUIName(@name)} "
+          @uiname = datasource.fieldUIName(@name).nil? ? @name : datasource.fieldUIName(@name) 
+          @uiCode = @uiname.nil? ? @techCode :  "[#{@uiname}]"
           @techUIdiff = !@techCode.eql?(@uiCode)
+          # puts ":b #{datasource.fieldUIName(@name).nil?}  ... #{@name}  ... #{@uiname}"
+          # puts "CalculationField ::       uin: %-25s | @name:%-s" % [@uiname,@name]
         end
       else # parts.length <> 1
+        # puts 'c'
         rdstech   = parts[0]
         calcField = parts[1]
-        @uiName   = calcField
-        @dataSource    = rdstech
-        @dataSourceRef = :remote
+        @uiname   = calcField
+        @dataSourceName = rdstech
+        @dataSourceRef  = :remote
         @techCode = "[#{rdstech}].[#{calcField}]"
         workbook  = datasource.workbook
-        remoteds  = workbook.nil? ? nil : workbook.datasource(rdstech)
+        @dataSource  = workbook.nil? ? nil : workbook.datasource(rdstech)
        # puts "\t  twb: #{workbook.class}  /  remoteds: #{remoteds.class}  : #{remoteds.nil? ? "<<NOT FOUND:#{rdstech}:>>" : remoteds.uiname} "
         #--
-        if remoteds.nil? || remoteds.fieldUIName(calcField).nil?
-          @uiName     = calcField
+        if @dataSource.nil? || @dataSource.fieldUIName(calcField).nil?
+          # puts 'd'
+          @uiname     = calcField
           @uiCode     = "[<<NOT FOUND>>#{rdstech}].[#{calcField}]"
           @techUIdiff = true
           @dataSourceExists = false
-        else !remoteds.nil?
-          @dataSource = remoteds.uiname
-          @uiName     = remoteds.fieldUIName(calcField)
-          @uiCode     = "[#{@dataSource}].[#{@uiName}]"
-          @techUIdiff = !@techCode.eql?(@uiCode)
+        else  # !remoteds.nil?
+          # puts 'e'
+          @dataSourceName = @dataSource.uiname
+          @uiname         = @dataSource.fieldUIName(calcField)
+          @uiCode         = "[#{@dataSourceName}].[#{@uiname}]"
+          @techUIdiff     = !@techCode.eql?(@uiCode)
           @dataSourceExists = true
         end
       end
-      @fqName = "#{@dataSource}::#{@uiName}"
+      # puts "\t     dsName: #{@dataSourceName}"
+      # puts "\t   @name: #{@name}"
+      # puts "\t     uiname: #{@uiname}"
+      @fqName = "#{@dataSourceName}::#{@uiname}"
+      @type   = if @dataSource.nil?
+                   :CalculatedField
+                else
+                   @dataSource.calculatedField(@uiname).nil? ? :DatabaseField : :CalculatedField
+                end
     end # initialize
 
+    def id
+      @id ||= @id = "#{@dataSourceName}::#{@uiname}"
+    end
+
     def <=>(other)
-      # myName    = @uiName.nil? ? '' : @uiName
+      # myName    = @uiname.nil? ? '' : @uiname
       # otherName = other.uiName.nil? ? "" : other.uiName
-      # # puts "#{@uiName} / #{myName} <=>  #{otherName} / #{other.uiName}"
-      # # puts "#{@uiName.nil?} // #{other.uiName.nil?}"
+      # # puts "#{@uiname} / #{myName} <=>  #{otherName} / #{other.uiName}"
+      # # puts "#{@uiname.nil?} // #{other.uiName.nil?}"
       # myName <=> otherName
       @fqName <=> other.fqName
     end