twb 5.2.6 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd5e3f60908b3588d6e16b24932760d10c7f529cee28c5b8c57cc6b536536e1
-  data.tar.gz: f11f10dacb407baa8ccad990d6ed1095970603f6863ceab276a85afd69b555ee
+  metadata.gz: 5c63301e4ed2102bfb1dc8263c66330ca45fea8bede79feefcd199d2e8625fc9
+  data.tar.gz: fcda0eece84eb97ee0dc86610c64cb89719eba4228e9c6609b48715fc2d6e472
 SHA512:
-  metadata.gz: 690986db75b5487436bc403e941cf9a5ba76e1cd30a067ed7ac9e19bfeef5abd2824373748263a4129af423039e2d0bb1e30fd505c2b98c23830b6ef0fa830a9
-  data.tar.gz: 797b79b25e06eddf021e66c81ad0393bee4c8adf417867b720884a9cde512affe0f0319dd145b534e591b8fec9f4dd4b82453dd377ce65268d36fc8a8ce70f10
+  metadata.gz: e12b541cd7e2db7743f2da2695629fafb9cdc3c0401d4c84d0ac2fe1218016d15ad2aae248225966c075435e7d10c028b1aea6bb460ef54220bfd94a0e340d9f
+  data.tar.gz: 937fc66db0cf3406d0f08721afc5dd5452d9c5d5bc324c737add7553b7cb6625a44f09244fa91eeea9a164037961ca03bd91065d756baefc4d21edc578e94f71

data/lib/twb/analysis/AnnotatedFieldsCSVEmitter.rb

@@ -26,7 +26,7 @@ module Analysis
 
     @@csvHeader = ['Record #',
                    'Workbook',           
-                   'Workbook Dir',
+                   'Workbook Directory',
                    'Data Source',
                    'Field',
                    'Doc Type',

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

@@ -29,7 +29,8 @@ module CalculatedFields
       @calcFieldsContents = 'Calculated Fields with Formulas'
       @calcFieldsType     = 'CalculatedFieldsWithFormulas'
       @calcFieldsHeader   = ['Record #',
-                             'Workbook',           'Workbook Dir',
+                             'Workbook',
+                             'Workbook Directory',
                              'Data Source Name (tech)', 'Data Source Caption', 'Data Source Name',
                              'Field Name (tech)',  'Field Caption',       'Field Name',
                              'Data Source + Field Name (tech)',
@@ -43,7 +44,8 @@ module CalculatedFields
       @refFieldsContents = 'Fields referenced in Calculated Fields Formulae'
       @refFieldsType     = 'CalculatedFieldsReferencedFields'
       @refFieldsHeader   = ['Record #',
-                            'Workbook',           'Workbook Dir',
+                            'Workbook',
+                            'Workbook Directory',
                             'Data Source Name (tech)', 'Data Source Caption', 'Data Source Name',
                             'Field Name (tech)',  'Field Caption',       'Field Name',
                             'Referenced Field',

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

@@ -36,6 +36,7 @@ module Analysis
       @@calcFieldsCSVFileName   = 'CalculatedFields.csv'
       @@calcFieldsCSVFileHeader = ['Record #',
                                    'Workbook',
+                                   'Workbook Directory',
                                    # 'Workbook Modified',
                                    'Data Source',   'Data Source Caption', 'Data Source Name (tech)',
                                    'Field Name',    'Field Caption',       'Field Name (tech)',
@@ -52,9 +53,9 @@ module Analysis
                                   ]
 
       @@calcLinesCSVFileName    = 'CalculatedFieldsFormulaLines.csv'
-      @@calcLinesCSVFileHeader  = ['Calc Field #',
+      @@calcLinesCSVFileHeader  = ['Record #',
                                    'Workbook',
-                                   # 'Workbook Modified',
+                                   'Workbook Directory',
                                    'Data Source',   'Data Source Caption', 'Data Source Name (tech)',
                                    'Field Name',    'Field Caption',       'Field Name (tech)',
                                    'Formula',       'Formula Line #',      'Formula Line'
@@ -63,7 +64,7 @@ module Analysis
       @@formFieldsCSVFileName   = 'CalculatedFieldsReferenced.csv'
       @@formFieldsCSVFileHeader = ['Record #',
                                    'Workbook',
-                                   # 'Workbook Modified',
+                                   'Workbook Directory',
                                    'Data Source',
                                    'Field - Calculated',
                                    'Formula (tech)',
@@ -206,6 +207,7 @@ module Analysis
                   csvRec =  [
                               @calculatedFieldsCount += 1,
                               @twb.name,
+                              @twb.dir,
                               # @modTime,            
                               ds.uiname,
                               ds.caption,
@@ -236,6 +238,7 @@ module Analysis
                     emit "@@ resolved line::   => '#{fl}'"
                     fieldFormulaLines << [ @calculatedFieldsCount,        # 'Calc Field #',
                                            @twb.name,                     # 'Workbook',
+                                           @twb.dir,                      # "workbook Directory
                                            # @modTime,      
                                            ds.uiname,                     # 'Data Source',   
                                            ds.caption,                    # 'Data Source Caption', 
@@ -255,6 +258,7 @@ module Analysis
                     @csvFormulaFields <<  [ 
                                             @referencedFieldsCount += 1,
                                             @twb.name,
+                                            @twb.dir,
                                             # @modTime,
                                             rf.dataSourceName, # ds.uiname,
                                             calcField.uiname,
@@ -310,47 +314,47 @@ module Analysis
           end
 
           # def mapTwb 
-          #   twb        = @twb.name
-          #   rootFields = @twbRootFields
-          #   dotStuff    = initDot twb
-          #   dotFile     = dotStuff[:file]
-          #   dotFileName = dotStuff[:name]
-          #   dotFile.puts "\n //  subgraph cluster_1 {"
-          #   dotFile.puts "   //    color= grey;"
-          #   dotFile.puts ""
-          #   edgesAsStrings = SortedSet.new
-          #   # this two step process coalesces the edges into a unique set, avoiding duplicating the dot
-          #   # file entries, and can be shrunk when graph edges expose the bits necessary for management by Set
-          #   emit "\n========================\nLoading Edges\n========================\n  From DC?  Referenced?  Edge \n  %s  %s  %s" % ['--------', '-----------', '-'*45]
-          #   @edges.each do |e|
-          #     # don't want to emit edge which is from a Data Connection to a
-          #     # Calculated Field which is also referenced by another calculated field
-          #     isFromDC   = e.from.type == :TwbDataConnection
-          #     isRefField = @referencedFields.include?(e.to.id)
-          #     edgesAsStrings.add(e.dot) unless isFromDC && isRefField
-          #     # emit "   ES        #{e.dot}"
-          #     # emit "   ES  from  #{e.from}"
-          #     # emit "   ES    to  #{e.to}"
-          #   end
-          #   emit "------------------------\n "
-          #   edgesAsStrings.each do |es|
-          #     dotFile.puts "        #{es}"
-          #   end
-          #   emit "========================\n "
-          #   dotFile.puts ""
-          #   dotFile.puts "   // }"
-          #   dotFile.puts "\n\n  //  4 NODES --------------------------------------------------------------------"
-          #   @nodes.each do |n|
-          #     dotFile.puts n.dotLabel
-          #   end
-          #   dotFile.puts "\n\n  //  5--------------------------------------------------------------------"
-          #   emitTypes(      dotFile )
-          #   closeDot(       dotFile, twb )
-          #   emit "Rendering DOT file - #{twb}"
-          #   renderDot(twb,dotFileName,'pdf')
-          #   renderDot(twb,dotFileName,'png')
-          #   renderDot(twb,dotFileName,'svg')
-          #   # emitEdges
+              #   twb        = @twb.name
+              #   rootFields = @twbRootFields
+              #   dotStuff    = initDot twb
+              #   dotFile     = dotStuff[:file]
+              #   dotFileName = dotStuff[:name]
+              #   dotFile.puts "\n //  subgraph cluster_1 {"
+              #   dotFile.puts "   //    color= grey;"
+              #   dotFile.puts ""
+              #   edgesAsStrings = SortedSet.new
+              #   # this two step process coalesces the edges into a unique set, avoiding duplicating the dot
+              #   # file entries, and can be shrunk when graph edges expose the bits necessary for management by Set
+              #   emit "\n========================\nLoading Edges\n========================\n  From DC?  Referenced?  Edge \n  %s  %s  %s" % ['--------', '-----------', '-'*45]
+              #   @edges.each do |e|
+              #     # don't want to emit edge which is from a Data Connection to a
+              #     # Calculated Field which is also referenced by another calculated field
+              #     isFromDC   = e.from.type == :TwbDataConnection
+              #     isRefField = @referencedFields.include?(e.to.id)
+              #     edgesAsStrings.add(e.dot) unless isFromDC && isRefField
+              #     # emit "   ES        #{e.dot}"
+              #     # emit "   ES  from  #{e.from}"
+              #     # emit "   ES    to  #{e.to}"
+              #   end
+              #   emit "------------------------\n "
+              #   edgesAsStrings.each do |es|
+              #     dotFile.puts "        #{es}"
+              #   end
+              #   emit "========================\n "
+              #   dotFile.puts ""
+              #   dotFile.puts "   // }"
+              #   dotFile.puts "\n\n  //  4 NODES --------------------------------------------------------------------"
+              #   @nodes.each do |n|
+              #     dotFile.puts n.dotLabel
+              #   end
+              #   dotFile.puts "\n\n  //  5--------------------------------------------------------------------"
+              #   emitTypes(      dotFile )
+              #   closeDot(       dotFile, twb )
+              #   emit "Rendering DOT file - #{twb}"
+              #   renderDot(twb,dotFileName,'pdf')
+              #   renderDot(twb,dotFileName,'png')
+              #   renderDot(twb,dotFileName,'svg')
+              #   # emitEdges
           # end
 
           def cypher twbName

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

@@ -31,7 +31,9 @@ module Analysis
       #--
       docFileName  = docFile('GroupFields.csv')
       @csv         = CSV.open(docFileName,'w')
-      @csv        << ['Workbook','Data Source','Field','Group','Member']
+      @csv        << [ 'Workbook',
+                       'Workbook Directory',
+                       'Data Source','Field','Group','Member']
       addDocFile @csv, docFileName, "Workbooks, Data Sources, and their Grouped Fields"
       #--
       @twbCount    = 0

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

@@ -28,26 +28,26 @@ module DataSources
     attr_reader :dsCount,     :fieldsCount  
 
     # @@csvHeader = ['Record #',
-    #                'Workbook',           
-    #                'Workbook Dir',
-    #                'Data Source',
-    #                'Field',
-    #                'Twb Type',
-    #                'Hidden',            # props[:hidden],
-    #                'Type - Column',     # props[:columnField],
-    #                'Type - Calculated', # props[:calculatedField],
-    #                'Type - Db',         # props[:dbField],
-    #                'Type - Mapped',     # props[:mappedField] 
-    #                'Type - MetaData',     # props[:mappedField]  
+        #                'Workbook',
+        #                'Workbook Directory',
+        #                'Data Source',
+        #                'Field',
+        #                'Twb Type',
+        #                'Hidden',            # props[:hidden],
+        #                'Type - Column',     # props[:columnField],
+        #                'Type - Calculated', # props[:calculatedField],
+        #                'Type - Db',         # props[:dbField],
+        #                'Type - Mapped',     # props[:mappedField]
+        #                'Type - MetaData',     # props[:mappedField]
     #               ]
     # @@csvFileType = 'TwbDataSourceFields'
     # @@csvFileName = @@csvFileType + '.csv'
 
     @@fullFileType = 'TwbDataSourceFieldsDetails'
     @@fullFileName = @@fullFileType + '.csv'
-    @@fullHeader = ['Field #',
+    @@fullHeader = ['Record #',
                     'Workbook',           
-                    'Workbook Dir',
+                    'Workbook Directory',
                     'Data Source',
                     'Field',
                     'Field - source',
@@ -59,9 +59,9 @@ module DataSources
 
     # @@techFileType = 'TwbDataSourceFieldsTech'
     # @@techFileName = @@techFileType + '.csv'
-    # @@techHeader = ['Field #',
+    # @@techHeader = ['Record #',
     #                 'Workbook',           
-    #                 'Workbook Dir',
+    #                 'Workbook Directory',
     #                 'Data Source',
     #                 'Field',
     #                 'Field Type',
@@ -82,11 +82,22 @@ module DataSources
       docFileName      = docFile(@@fullFileName)
       @sheetFieldsCSV  = CSV.open( docFileName,@csvMode)
       unless @csvAdd
-        if @recordDir
-          @sheetFieldsCSV  << ['Rec #','Workbook','Workbook Modified','Worksheet','Filter Type','Operation','Data Source','Field','Value','Alias', 'Alias?','Operation Mode','Include Null?','Kind','Workbook Dir']
-        else
-          @sheetFieldsCSV  << ['Rec #','Workbook','Workbook Modified','Worksheet','Filter Type','Operation','Data Source','Field','Value','Alias', 'Alias?','Operation Mode','Include Null?','Kind']
-        end
+          @sheetFieldsCSV  << [ 'Record #',
+                                'Workbook',
+                                'Workbook Directory',
+                                'Workbook Modified',
+                                'Worksheet',
+                                'Filter Type',
+                                'Operation',
+                                'Data Source',
+                                'Field',
+                                'Value',
+                                'Alias',
+                                'Alias?',
+                                'Operation Mode',
+                                'Include Null?',
+                                'Kind'
+                              ]
       end
       addDocFile @sheetFieldsCSV, docFileName, "Workbooks, Worksheets and the sheets' Quick Filters"
       #--

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

@@ -1,4 +1,4 @@
-#  categoricalColorCodingAnalyzer.rb Copyright (C) 2018  Chris Gerrard
+#  categoricalColorCodingAnalyzer.rb Copyright (C) 2018,2024  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
@@ -31,7 +31,15 @@ module Analysis
       #--
       docFileName = docFile('CategoricalColorMappings.csv')
       $csv  = CSV.open(docFileName,'w')
-      $csv  << ['Workbook', 'Workbook Dir', 'Data Source', 'Field Code', 'Field Tech', 'Field', 'Value', 'Colour']
+      $csv  << [ 'Workbook',
+                 'Workbook Directory',
+                 'Data Source',
+                 'Field Code',
+                 'Field Tech',
+                 'Field',
+                 'Value',
+                 'Colour'
+               ]
       addDocFile docFileName, "Workbooks, Data Sources, Fields, and the Fields' members' categorical color codings."
       #--
       @twbCnt    = 0
@@ -49,8 +57,8 @@ module Analysis
 
     def processTWB twb
       @twb = twb
-      twbName  = twb.name
-      twbDir   = twb.dir
+      twbName  = @twb.name
+      twbDir   = @twb.dir
       emit "   -- #{twbName}"
       @twbCnt += 1
       @twbDomainsLoaded = false
@@ -85,8 +93,15 @@ module Analysis
                       end
                     end
                   end
-                  # puts "\t     - #{color}  ->  #{value}"
-                  $csv << [twbName, twbDir, dsName, fieldCode, fieldTech, fieldUI, value, color]
+                  $csv << [ @twb.name,
+                            @twb.dir,
+                            dsName,
+                            fieldCode,
+                            fieldTech,
+                            fieldUI,
+                            value,
+                            color
+                          ]
                   puts "VALUE: #{value}"
               end
           end