taskjuggler 0.0.6 → 0.0.7

data/lib/ProjectFileParser.rb

@@ -33,9 +33,10 @@ class TaskJuggler
     # Create the parser object. _messageHandler_ is a TjMessageHandler that is
     # used for error reporting.
     def initialize(messageHandler)
-      super()
+      super
+
+      @tjMessageHandler = messageHandler
 
-      @messageHandler = messageHandler
       # Define the token types that the ProjectFileScanner may return for
       # variable elements.
       @variables = %w( INTEGER FLOAT DATE TIME STRING LITERAL ID ID_WITH_COLON
@@ -49,17 +50,13 @@ class TaskJuggler
     # Call this function with the master file to start processing a TJP file or
     # a set of TJP files.
     def open(file, master, fileNameIsBuffer = false)
-      begin
-        @scanner = ProjectFileScanner.new(file, @messageHandler)
-        # We need the ProjectFileScanner object for error reporting.
-        if master && !fileNameIsBuffer && file != '.' && file[-4, 4] != '.tjp'
-          error('illegal_extension', "Project file name must end with " +
-                '\'.tjp\' extension')
-        end
-        @scanner.open(fileNameIsBuffer)
-      rescue StandardError
-        error('file_open', $!.message)
+      @scanner = ProjectFileScanner.new(file, @messageHandler)
+      # We need the ProjectFileScanner object for error reporting.
+      if master && !fileNameIsBuffer && file != '.' && file[-4, 4] != '.tjp'
+        error('illegal_extension', "Project file name must end with " +
+              '\'.tjp\' extension')
       end
+      @scanner.open(fileNameIsBuffer)
 
       @property = nil
       @scenarioIdx = 0
@@ -69,8 +66,7 @@ class TaskJuggler
     # Call this function to cleanup the parser structures after the file
     # processing has been completed.
     def close
-      res = @scanner.close
-      res
+      @scanner.close
     end
 
     # This function will deliver the next token from the scanner. A token is a
@@ -104,9 +100,9 @@ class TaskJuggler
     end
 
     def parseReportAttributes(report, attributes)
+      open(attributes, false, true)
       @property = report
       @project = report.project
-      open(attributes, false, true)
       parse('reportAttributes')
     end
 
@@ -129,8 +125,8 @@ class TaskJuggler
       if @property.container?
         error('container_attribute',
               "The attribute #{attribute} may not be used for this property " +
-              'after sub properties have been added.', @property,
-              @sourceFileInfo[0])
+              'after sub properties have been added.', @sourceFileInfo[0],
+              @property)
       end
     end
 
@@ -154,15 +150,15 @@ class TaskJuggler
     def checkBooking(task, resource)
       unless task.leaf?
         error('booking_no_leaf', "#{task.fullId} is not a leaf task",
-              task, @sourceFileInfo[0])
+              @sourceFileInfo[0], task)
       end
       if task['milestone', @scenarioIdx]
         error('booking_milestone', "You cannot add bookings to a milestone",
-              task, @sourceFileInfo[0])
+              @sourceFileInfo[0], task)
       end
       unless resource.leaf?
         error('booking_group', "You cannot book a group resource",
-              task, @sourceFileInfo[0])
+              @sourceFileInfo[0], task)
       end
     end
 
@@ -218,19 +214,20 @@ class TaskJuggler
     # by _tokenSet_.
     def newRichText(text, tokenSet = nil)
       sfi = sourceFileInfo
-      begin
-        rText = RichText.new(text, RTFHandlers.create(@project, sfi))
-        rti = rText.generateIntermediateFormat( [ 0, 0, 0], tokenSet)
-        rti.sectionNumbers = false
-      rescue RichTextException => msg
-        sfi = SourceFileInfo.new(sfi.fileName, sfi.lineNo + msg.lineNo - 1, 0)
-        message = Message.new(msg.id, 'error', msg.text + "\n" + msg.line,
-                              @property, nil, sfi)
-        @messageHandler.send(message)
-
-        # An empty strings signals an already reported error
-        raise TjException.new, ''
+      rText = RichText.new(text, RTFHandlers.create(@project, sfi))
+      unless (rti = rText.generateIntermediateFormat( [ 0, 0, 0], tokenSet))
+        rText.messageHandler.messages.each do |msg|
+          # Map the SourceFileInfo of the RichText back to the original
+          # location in the input file.
+          sfi = SourceFileInfo.new(sfi.fileName,
+                                   sfi.lineNo + msg.sourceFileInfo.lineNo - 1,
+                                   0)
+          # Then replay the error message.
+          @messageHandler.addMessage(msg.type, msg.id, msg.message, sfi,
+                                     msg.line)
+        end
       end
+      rti.sectionNumbers = false
       rti
     end
 
@@ -429,8 +426,8 @@ class TaskJuggler
     # variables according to the now top-entry.
     def popFileStack
       @fileStack.pop
+      stackEntry = @fileStack.last
       @fileStackVariables.each do |var|
-        stackEntry = @fileStack.last
         instance_variable_set('@' + var, stackEntry[var])
       end
     end

data/lib/ProjectFileScanner.rb

@@ -19,8 +19,6 @@ class TaskJuggler
   class ProjectFileScanner < TextScanner
 
     def initialize(masterFile, messageHandler)
-      super
-
       tokenPatterns = [
         # Any white spaces
         [ nil, /\s+/, :tjp, method('newPos') ],
@@ -55,14 +53,14 @@ class TaskJuggler
         # with neither start nor end. Macro calls inside of strings need a
         # special start pattern that is active in the string modes. Both
         # patterns switch the scanner to macroCall mode.
-        [ nil, /([-a-zA-Z_0-9>:.+]*|"(\\"|[^"])*|'(\\'|[^'])*|-8<-.*)?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, /([-a-zA-Z_0-9>:.+]*|"(\\"|[^"])*?|'(\\'|[^'])*?)?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           :tjp, method('startMacroCall') ],
         # This pattern is similar to the previous one, but is active inside of
         # multi-line strings. The corresponding rule for sizzors strings
         # can be found below.
-        [ nil, /(\\"|[^"])*\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, /(\\"|[^"])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           :dqString, method('startMacroCall') ],
-        [ nil, /(\\'|[^'])*\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, /(\\'|[^'])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           :sqString, method('startMacroCall') ],
         # This pattern matches the end of a macro call. It injects the prefix
         # and the expanded macro into the scanner again. The mode is restored
@@ -120,7 +118,7 @@ class TaskJuggler
         [ 'STRING', /\s*->8-/, :szrString1, method('endStringSZR') ],
         [ 'STRING', /\s*->8-/, :szrString, method('endStringSZR') ],
         # This rule handles macros inside of sizzors strings.
-        [ nil, /.*\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, /.*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           [ :szrString, :szrString1 ], method('startMacroCall') ],
         # Any line not containing the start or end.
         [ 'nil', /.*\n/, :szrString1, method('firstStringSZR') ],
@@ -147,14 +145,7 @@ class TaskJuggler
         [ 'LITERAL', /./ ]
       ]
 
-      tokenPatterns.each do |pat|
-        type = pat[0]
-        regExp = pat[1]
-        mode = pat[2] || :tjp
-        postProc = pat[3]
-        addPattern(type, regExp, mode, postProc)
-      end
-      self.mode = :tjp
+      super(masterFile, messageHandler, tokenPatterns, :tjp)
     end
 
     private
@@ -266,7 +257,7 @@ class TaskJuggler
     def firstStringSZR(type, match)
       self.mode = :szrString
       # Split the leading indentation and the rest of the string.
-      foo, @indent, @string = */(\s*)(.*\n)/.match(match)
+      @indent, @string = */(\s*)(.*\n)/.match(match)[1, 2]
       [ nil, '' ]
     end
 
@@ -333,7 +324,7 @@ class TaskJuggler
       # Remove '${' and '}'
       argsStr = @macroCall[2..-2]
       # Extract the macro name.
-      if (nameEnd = argsStr.index(' ')).nil?
+      if argsStr.index(' ').nil?
         expandMacro(prefix, [ argsStr ])
       else
         macroName = argsStr[0, argsStr.index(' ')]

data/lib/PropertyList.rb

@@ -94,33 +94,6 @@ class TaskJuggler
       sort!
     end
 
-    # Append a new sorting level to the existing levels.
-    def addSortingCriteria(criteria, up, scIdx)
-      unless @propertySet.knownAttribute?(criteria) ||
-             @propertySet.hasQuery?(criteria, scIdx)
-        raise TjException.new, "Unknown attribute #{criteria} used for " +
-                               'sorting criterium'
-      end
-      if scIdx == -1
-        if @propertySet.scenarioSpecific?(criteria)
-          raise TjException.new, "Attribute #{criteria} is scenario specific." +
-                "You must specify a scenario id."
-        end
-      else
-        if @propertySet.project.scenario(scIdx).nil?
-          raise TjException.new, "Unknown scenario index #{scIdx} used."
-        end
-        if !@propertySet.scenarioSpecific?(criteria)
-          raise TjException.new, "Attribute #{criteria} is not scenario " +
-                                 "specific"
-        end
-      end
-      @sortingCriteria.push(criteria)
-      @sortingUp.push(up)
-      @scenarioIdx.push(scIdx)
-      @sortingLevels += 1
-    end
-
     # If the first sorting level is 'tree' the breakdown structure of the
     # list is preserved. This is a somewhat special mode and this function
     # returns true if the mode is set.
@@ -191,6 +164,31 @@ class TaskJuggler
 
     private
 
+    # Append a new sorting level to the existing levels.
+    def addSortingCriteria(criteria, up, scIdx)
+      unless @propertySet.knownAttribute?(criteria) ||
+             @propertySet.hasQuery?(criteria, scIdx)
+        raise "Unknown attribute #{criteria} used for sorting criterium"
+      end
+      if scIdx == -1
+        if @propertySet.scenarioSpecific?(criteria)
+          raise "Attribute #{criteria} is scenario specific." +
+                "You must specify a scenario id."
+        end
+      else
+        if @propertySet.project.scenario(scIdx).nil?
+          raise "Unknown scenario index #{scIdx} used."
+        end
+        if !@propertySet.scenarioSpecific?(criteria)
+          raise "Attribute #{criteria} is not scenario specific"
+        end
+      end
+      @sortingCriteria.push(criteria)
+      @sortingUp.push(up)
+      @scenarioIdx.push(scIdx)
+      @sortingLevels += 1
+    end
+
     # Update the 'tree' indicies that are needed for the 'tree' sorting mode.
     def indexTree
       @items.each do |property|

data/lib/PropertySet.rb

@@ -200,7 +200,7 @@ class TaskJuggler
     def addProperty(property)
       # The PropertySet defines the set of attribute that each PropertyTreeNode
       # in this set has. Create these attributes with their default values.
-      @attributeDefinitions.each do |id, attributeType|
+      @attributeDefinitions.each_value do |attributeType|
         property.declareAttribute(attributeType)
       end
 

data/lib/PropertyTreeNode.rb

@@ -359,8 +359,7 @@ class TaskJuggler
         @sequenceNo
       else
         unless @attributes.has_key?(attributeId)
-          raise TjException.new,
-                "Unknown attribute '#{attributeId}' requested for " +
+          raise "Unknown attribute '#{attributeId}' requested for " +
                 "#{self.class.to_s.sub(/TaskJuggler::/, '')} '#{fullId}'"
         end
         @attributes[attributeId].get
@@ -407,7 +406,7 @@ class TaskJuggler
     # In case the attribute does not exist, an exception is raised.
     def set(attributeId, value)
       unless @attributes.has_key?(attributeId)
-        raise TjException.new, "Unknown attribute #{attributeId}"
+        raise "Unknown attribute #{attributeId}"
       end
       @attributes[attributeId].set(value)
     end
@@ -421,7 +420,7 @@ class TaskJuggler
       elsif @attributes.has_key?(attributeId)
         @attributes[attributeId].set(value)
       else
-        raise TjException.new, "Unknown attribute #{attributeId}"
+        raise "Unknown attribute #{attributeId}"
       end
       @scenarioAttributes[scenario][attributeId].set(value)
     end
@@ -571,7 +570,7 @@ class TaskJuggler
       # we compose the result as RichText markup first.
       rText = ''
       entries.each do |entry|
-        rText += "=== <nowiki>" + entry.headline + "</nowiki> ===\n"
+        rText += "==== <nowiki>" + entry.headline + "</nowiki> ====\n"
         rText += "''Reported on #{entry.date.to_s(query.timeFormat)}'' "
         if entry.author
           rText += "''by <nowiki>#{entry.author.name}</nowiki>''"
@@ -586,13 +585,11 @@ class TaskJuggler
       end
       # Now convert the RichText markup String into RichTextIntermediate
       # format.
-      begin
-        rti = RichText.new(rText, RTFHandlers.create(@project)).
-          generateIntermediateFormat
-      rescue RichTextException => msg
-        $stderr.puts "Error while processing Rich Text\n" +
-                     "Line #{msg.lineNo}: #{msg.text}\n" +
-                     "#{msg.line}"
+      unless (rti = RichText.new(rText, RTFHandlers.create(@project),
+                                 @project.messageHandler).
+                                 generateIntermediateFormat)
+        @project.messageHandler.warning('ptn_journal',
+                                        "Syntax error in journal message")
         return nil
       end
       # No section numbers, please!

data/lib/Query.rb

@@ -37,7 +37,7 @@ class TaskJuggler
                   :attributeId, :scenarioIdx,
                   :timeFormat, :numberFormat, :currencyFormat, :costAccount,
                   :revenueAccount,
-                  :loadUnit,
+                  :loadUnit, :selfContained,
                   :ok, :errorMessage
     attr_reader :end, :endIdx, :start, :startIdx
     attr_writer :sortable, :numerical, :string, :rti
@@ -48,7 +48,8 @@ class TaskJuggler
       ps = %w( project propertyType propertyId property scopePropertyId
                scopeProperty attributeId scenario scenarioIdx
                loadUnit numberFormat currencyFormat timeFormat
-               costAccount revenueAccount)
+               costAccount revenueAccount selfContained)
+      @selfContained = false
       ps.each do |p|
         instance_variable_set('@' + p, parameters[p] ? parameters[p] : nil)
       end
@@ -239,7 +240,7 @@ class TaskJuggler
 
     def resolvePropertyId(pType, pId)
       unless @project
-        raise TjException.new, "Need Project reference to process the query"
+        raise "Need Project reference to process the query"
       end
       case pType
       when :Account
@@ -249,7 +250,7 @@ class TaskJuggler
       when:Resource
         @project.resource(pId)
       else
-        raise TjException.new, "Unknown property type #{pType}"
+        raise "Unknown property type #{pType}"
       end
     end
 

data/lib/RTFNavigator.rb

@@ -22,7 +22,8 @@ class TaskJuggler
   class RTFNavigator < RichTextFunctionHandler
 
     def initialize(project, sourceFileInfo = nil)
-      super(project, 'navigator', sourceFileInfo)
+      @project = project
+      super(project.messageHandler, 'navigator', sourceFileInfo)
       @blockFunction = true
     end
 

data/lib/RTFQuery.rb

@@ -10,7 +10,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'RichTextFunctionHandler'
+require 'RTFWithQuerySupport'
 require 'XMLElement'
 require 'Query'
 
@@ -18,19 +18,12 @@ class TaskJuggler
 
   # This class is a specialized RichTextFunctionHandler that can be used to
   # query the value of a project or property attribute.
-  class RTFQuery < RichTextFunctionHandler
+  class RTFQuery < RTFWithQuerySupport
 
     def initialize(project, sourceFileInfo = nil)
-      super(project, 'query', sourceFileInfo)
+      @project = project
+      super(project.messageHandler, 'query', sourceFileInfo)
       @blockMode = false
-      @query = nil
-    end
-
-    # This function must be called to register the Query object that will be
-    # used to resolve the queries. It will create a copy of the object since
-    # it will modify it.
-    def setQuery(query)
-      @query = query.dup
     end
 
     # Return the result of the query as String.

data/lib/RTFReport.rb

@@ -20,7 +20,8 @@ class TaskJuggler
   class RTFReport < RichTextFunctionHandler
 
     def initialize(project, sourceFileInfo = nil)
-      super(project, 'report', sourceFileInfo)
+      @project = project
+      super(project.messageHandler, 'report', sourceFileInfo)
       @blockFunction = true
     end
 

data/lib/RTFReportLink.rb

@@ -10,19 +10,22 @@
 # published by the Free Software Foundation.
 #
 
-require 'RichTextFunctionHandler'
+require 'RTFWithQuerySupport'
 require 'XMLElement'
 require 'URLParameter'
+require 'SimpleQueryExpander'
 
 class TaskJuggler
 
   # This class is a specialized RichTextFunctionHandler that generates a link
   # to another report. It's not available on all output formats.
-  class RTFReportLink < RichTextFunctionHandler
+  class RTFReportLink < RTFWithQuerySupport
 
     def initialize(project, sourceFileInfo = nil)
-      super(project, 'reportlink', sourceFileInfo)
+      @project = project
+      super(project.messageHandler, 'reportlink', sourceFileInfo)
       @blockFunction = false
+      @query = nil
     end
 
     # Not supported for this function
@@ -49,7 +52,10 @@ class TaskJuggler
               "report=#{report.fullId}"
 
         if args['attributes']
-          url += ";attributes=" + URLParameter.encode(args['attributes'])
+          qEx = SimpleQueryExpander.new(args['attributes'], @query,
+                                        @project.messageHandler,
+                                        @sourceFileInfo)
+          url += ";attributes=" + URLParameter.encode(qEx.expand)
         end
       else
         # The report name just gets a '.html' extension.