taskjuggler 0.1.1 → 0.2.0

data/lib/taskjuggler/Project.rb

@@ -117,10 +117,16 @@ class TaskJuggler
         #     Inh.   Inh.Prj  Scen.  Default
         [ 'active',   'Enabled',    BooleanAttribute,
               true,  false,   false, true ],
+        [ 'id',       'ID',         StringAttribute,
+              false, false,   false, nil ],
+        [ 'name',     'Name',       StringAttribute,
+              false, false,   false, nil ],
         [ 'ownbookings', 'Own Bookings', BooleanAttribute,
               false, false,   false, true ],
         [ 'projection', 'Projection Mode', BooleanAttribute,
               true,  false,   false, false ],
+        [ 'seqno',    'No',          FixnumAttribute,
+              false, false,   false, nil ],
       ]
       attrs.each { |a| @scenarios.addAttributeType(AttributeDefinition.new(*a)) }
 
@@ -128,18 +134,24 @@ class TaskJuggler
       attrs = [
         # ID           Name            Type
         #     Inh.   Inh.Prj  Scen.  Default
+        [ 'bsi',      'BSI',          StringAttribute,
+              false, false,   false, "" ],
+        [ 'id',       'ID',         StringAttribute,
+              false, false,   false, nil ],
         [ 'index',     'Index',        FixnumAttribute,
               false, false,   false, -1 ],
+        [ 'name',     'Name',       StringAttribute,
+              false, false,   false, nil ],
         [ 'replace',   'Replace',      BooleanAttribute,
               true,  false,   true,  false ],
+        [ 'seqno',    'No',          FixnumAttribute,
+              false, false,   false, nil ],
         [ 'timezone',  'Time Zone',    StringAttribute,
               true,  true,    true,  TjTime.timeZone ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
-        [ 'vacations', 'Vacations',    IntervalListAttribute,
+        [ 'vacations', 'Vacations',    TimeIntervalListAttribute,
               true,  true,    true,  [] ],
-        [ 'bsi',       'BSI',          StringAttribute,
-              false, false,   false, "" ],
         [ 'workinghours', 'Working Hours', WorkingHoursAttribute,
               true,  true,    true,  nil ]
       ]
@@ -149,13 +161,19 @@ class TaskJuggler
       attrs = [
         # ID           Name            Type
         #     Inh.   Inh.Prj  Scen.  Default
+        [ 'bsi',       'BSI',          StringAttribute,
+              false, false,   false, "" ],
+        [ 'id',       'ID',         StringAttribute,
+              false, false,   false, nil ],
         [ 'index',     'Index',        FixnumAttribute,
               false, false,   false, -1 ],
         [ 'flags',     'Flags',        FlagListAttribute,
               true,  false,   true,  [] ],
+        [ 'name',     'Name',       StringAttribute,
+              false, false,   false, nil ],
+        [ 'seqno',    'No',          FixnumAttribute,
+              false, false,   false, nil ],
         [ 'tree',      'Tree Index',   StringAttribute,
-              false, false,   false, "" ],
-        [ 'bsi',       'BSI',          StringAttribute,
               false, false,   false, "" ]
       ]
       attrs.each { |a| @accounts.addAttributeType(AttributeDefinition.new(*a)) }
@@ -166,6 +184,8 @@ class TaskJuggler
         #     Inh.   Inh.Prj  Scen.  Default
         [ 'alloctdeffort', 'Alloctd. Effort', FloatAttribute,
               false, false,   true,  0.0 ],
+        [ 'bsi',       'BSI',          StringAttribute,
+              false, false,   false, "" ],
         [ 'criticalness', 'Criticalness', FloatAttribute,
               false, false,   true,  0.0 ],
         [ 'duties',    'Duties',       TaskListAttribute,
@@ -196,16 +216,16 @@ class TaskJuggler
               true,  true,    true,  0.0 ],
         [ 'reports', 'Reports', ResourceListAttribute,
               false, false,   true,  [] ],
+        [ 'seqno',    'No',          FixnumAttribute,
+              false, false,   false, nil ],
         [ 'shifts',    'Shifts',       ShiftAssignmentsAttribute,
               true, false,    true,  nil ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
-        [ 'vacations',  'Vacations',   IntervalListAttribute,
+        [ 'vacations',  'Vacations',   TimeIntervalListAttribute,
               true,  true,    true,  [] ],
         [ 'warn',      'Warning Condition', LogicalExpressionListAttribute,
               false, false,   false, [] ],
-        [ 'bsi',       'BSI',          StringAttribute,
-              false, false,   false, "" ],
         [ 'workinghours', 'Working Hours', WorkingHoursAttribute,
               true,  true,    true,  nil ]
       ]
@@ -221,6 +241,8 @@ class TaskJuggler
               false, false,   true,  [] ],
         [ 'booking',   'Bookings',     BookingListAttribute,
               false, false,   true,  [] ],
+        [ 'bsi',       'BSI',          StringAttribute,
+              false, false,   false, "" ],
         [ 'charge',    'Charges',      ChargeListAttribute,
               false, false,   true,  [] ],
         [ 'chargeset', 'Charge Sets',  ChargeSetListAttribute,
@@ -247,6 +269,8 @@ class TaskJuggler
               true,  false,   true,  [] ],
         [ 'forward',   'Scheduling',   BooleanAttribute,
               true,  false,   true,  true ],
+        [ 'id',       'ID',         StringAttribute,
+              false, false,   false, nil ],
         [ 'index',     'Index',        FixnumAttribute,
               false, false,   false, -1 ],
         [ 'length',    'Length',       DurationAttribute,
@@ -263,6 +287,8 @@ class TaskJuggler
               false, false,   true,  nil ],
         [ 'minstart',  'Min. Start',   DateAttribute,
               true,  false,   true,  nil ],
+        [ 'name',     'Name',       StringAttribute,
+              false, false,   false, nil ],
         [ 'note',      'Note',         RichTextAttribute,
               false, false,   false, nil ],
         [ 'pathcriticalness', 'Path Criticalness', FloatAttribute,
@@ -277,6 +303,8 @@ class TaskJuggler
               true,  false,   true,  [] ],
         [ 'scheduled', 'Scheduled',    BooleanAttribute,
               true,  false,   true,  false ],
+        [ 'seqno',    'No',          FixnumAttribute,
+              false, false,   false, nil ],
         [ 'shifts',     'Shifts',      ShiftAssignmentsAttribute,
               true,  false,   true, nil ],
         [ 'start',     'Start',        DateAttribute,
@@ -290,9 +318,7 @@ class TaskJuggler
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
         [ 'warn',      'Warning Condition', LogicalExpressionListAttribute,
-              false, false,   false, [] ],
-        [ 'bsi',       'BSI',          StringAttribute,
-              false, false,   false, "" ]
+              false, false,   false, [] ]
       ]
       attrs.each { |a| @tasks.addAttributeType(AttributeDefinition.new(*a)) }
 
@@ -300,8 +326,10 @@ class TaskJuggler
       attrs = [
         # ID           Name            Type
         #     Inh.   Inh.Prj  Scen.  Default
+        [ 'bsi',       'BSI',          StringAttribute,
+              false, false,   false, "" ],
         [ 'caption',   'Caption',      RichTextAttribute,
-              true, false,   false, nil ],
+              true,  false,   false, nil ],
         [ 'center',    'Center',       RichTextAttribute,
               true,  false,   false, nil ],
         [ 'columns',   'Columns',      ColumnListAttribute,
@@ -315,7 +343,7 @@ class TaskJuggler
         [ 'end',       'End',          DateAttribute,
               true,  true,    false, nil ],
         [ 'epilog',    'Epilog',       RichTextAttribute,
-              true, false,   false, nil ],
+              true,  false,   false, nil ],
         [ 'flags',     'Flags',        FlagListAttribute,
               true,  false,   true,  [] ],
         [ 'footer',    'Footer',       RichTextAttribute,
@@ -327,13 +355,15 @@ class TaskJuggler
         [ 'header',    'Header',       RichTextAttribute,
               true,  false,   false, nil ],
         [ 'headline',  'Headline',     RichTextAttribute,
-              true, false,   false, nil ],
+              true,  false,   false, nil ],
         [ 'hideJournalEntry', 'Hide JournalEntry', LogicalExpressionAttribute,
               true,  false,   false, nil ],
         [ 'hideResource', 'Hide Resource', LogicalExpressionAttribute,
               true,  false,   false, nil ],
         [ 'hideTask',  'Hide Task',    LogicalExpressionAttribute,
               true,  false,   false, nil ],
+        [ 'id',       'ID',         StringAttribute,
+              false, false,   false, nil ],
         [ 'index',     'Index',        FixnumAttribute,
               false, false,   false, -1 ],
         [ 'interactive', 'Interactive', BooleanAttribute,
@@ -342,6 +372,8 @@ class TaskJuggler
               true,  false,   false, nil ],
         [ 'loadUnit',  'Load Unit',    StringAttribute,
               true,  true,    false, nil ],
+        [ 'name',     'Name',       StringAttribute,
+              false, false,   false, nil ],
         [ 'now',       'Now',          DateAttribute,
               true,  true,    false, nil ],
         [ 'numberFormat', 'Number Format', RealFormatAttribute,
@@ -366,6 +398,8 @@ class TaskJuggler
               true, false,    false, [ 0 ] ],
         [ 'selfcontained', 'Selfcontained', BooleanAttribute,
               true, false,    false, false ],
+        [ 'seqno',    'No',          FixnumAttribute,
+              false, false,   false, nil ],
         [ 'shortTimeFormat', 'Short Time Format', StringAttribute,
               true,  true,    false, nil ],
         [ 'sortResources', 'Sort Resources', SortListAttribute,
@@ -381,17 +415,15 @@ class TaskJuggler
         [ 'timeFormat', 'Time Format', StringAttribute,
               true,  true,    false, nil ],
         [ 'timeOffId',  'Time Off ID', StringAttribute,
-              false,  false,   false, nil ],
+              false,  false,  false, nil ],
         [ 'timeOffName',  'Time Off Name', StringAttribute,
-              false,  false,   false, nil ],
+              false,  false,  false, nil ],
         [ 'timezone', 'Time Zone',     StringAttribute,
               true,  true,    false, TjTime.timeZone ],
         [ 'title',    'Title',         StringAttribute,
-              true, false,   false, nil ],
+              true,  false,   false, nil ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
-        [ 'bsi',       'BSI',          StringAttribute,
-              false, false,   false, "" ],
         [ 'weekStartsMonday', 'Week Starts Monday', BooleanAttribute,
               true,  true,    false, false ]
       ]
@@ -449,12 +481,6 @@ class TaskJuggler
             WorkingHours.new(@attributes['scheduleGranularity'],
                              @attributes['start'], @attributes['end'],
                              @attributes['timezone'])
-          # WorkingHours is using a copy-on-write scheme to prevent multiple
-          # copies of the same Scoreboard. All other WorkingHours objects are
-          # created as copies of this object. By calling
-          # WorkingHours::onShift? we make sure this instance has got a
-          # Scoreboard that gets reused by the other instances.
-          @attributes['workinghours'].onShift?(@attributes['start'])
         end
       end
       value
@@ -601,7 +627,7 @@ class TaskJuggler
       end
 
       if @tasks.empty?
-        @messageHandler.error('no_tasks', "No tasks defined")
+        error('no_tasks', "No tasks defined")
       end
 
       @scenarios.each do |sc|
@@ -643,18 +669,29 @@ class TaskJuggler
     # format.
     def checkReports
       if @reports.empty?
-        @messageHandler.warning('no_report_defined',
-                                "This project has no reports defined. " +
-                                "No output data will be generated.")
+        warning('no_report_defined',
+                "This project has no reports defined. " +
+                "No output data will be generated.")
+      end
+
+      unless @accounts.empty?
+        @reports.each do |report|
+          if report.get('costAccount').nil? || report.get('revenueAccount').nil?
+            warning('report_without_balance',
+                    "The report #{report.fullId} has no 'balance' defined. " +
+                    "No cost or revenue computation will be possible.",
+                    report.sourceFileInfo)
+          end
+        end
       end
 
       @reports.each do |report|
         return unless report.get('formats').empty?
       end
 
-      @messageHandler.warning('all_formats_empty',
-                              "None of the reports has a 'formats' attribute. " +
-                              "No output data will be generated.")
+      warning('all_formats_empty',
+              "None of the reports has a 'formats' attribute. " +
+              "No output data will be generated.")
     end
 
     # Call this function to generate the reports based on the scheduling result.
@@ -689,10 +726,10 @@ class TaskJuggler
           $stdout.print(report.stdout)
           $stderr.print(report.stderr)
           if report.retVal.signaled?
-            @messageHandler.error('rg_signal', "Signal raised")
+            error('rg_signal', "Signal raised")
           end
           unless report.retVal.success?
-            @messageHandler.error('rg_abort', "Process aborted")
+            error('rg_abort', "Process aborted")
           end
           Log.stopProgressMeter
         end
@@ -709,9 +746,9 @@ class TaskJuggler
                 "Request to generate unknown report #{id}")
         end
         if formats.nil? && report.get('formats').empty?
-          @messageHandler.error('formats_empty',
-           "The report #{report.fullId} has no 'formats' attribute. " +
-           "No output data will be generated.")
+          error('formats_empty',
+                "The report #{report.fullId} has no 'formats' attribute. " +
+                "No output data will be generated.", report.sourceFileInfo)
         end
 
         Log.startProgressMeter("Report #{report.name}")
@@ -788,38 +825,69 @@ class TaskJuggler
     end
 
     # call-seq:
+    #   isWorkingTime(slotIdx) -> true or false
     #   isWorkingTime(slot) -> true or false
     #   isWorkingTime(startTime, endTime) -> true or false
     #   isWorkingTime(interval) -> true or false
     #
-    # Return true if the _slot_ (TjTime) is withing globally defined working
-    # time or false if not. If the argument is an Interval, all slots of the
-    # interval must be working time to return true as result. Global work time
-    # means, no vacation defined and the slot lies within a defined working time
-    # period.
+    # Return true if the slot or interval is withing globally defined working
+    # time or false if not. If the argument is a TimeInterval, all slots of
+    # the interval must be working time to return true as result. Global work
+    # time means, no global vacation defined and the slot lies within a
+    # defined global working time period.
     def isWorkingTime(*args)
-      # Normalize argument(s) to Interval
+      # Normalize argument(s) to TimeInterval
       if args.length == 1
-        if args[0].is_a?(Interval)
-          iv = args[0]
+        if args[0].is_a?(Fixnum) || args[0].is_a?(Bignum)
+          return @scoreboard[args[0]].nil?
+        elsif args[0].is_a?(TjTime)
+          return @scoreboard[dateToIdx(args[0])].nil?
+        elsif args[0].is_a?(TimeInterval)
+          startIdx = dateToIdx(args[0].start)
+          endIdx = dateToIdx(args[0].end)
         else
-          iv = Interval.new(args[0], args[0] +
-                            @attributes['scheduleGranularity'])
+          raise ArgumentError, "Unsupported argument type #{args[0].class}"
         end
       else
-        iv = Interval.new(args[0], args[1])
+        startIdx = dateToIdx(args[0])
+        endIdx = dateToIdx(args[1])
       end
 
-      # Check if the interval has overlap with any of the global vacations.
-      @attributes['vacations'].each do |vacation|
-        return false if vacation.overlaps?(iv)
+      startIdx.upto(endIdx) do |idx|
+        return false if @scoreboard[idx]
       end
 
-      return false if @attributes['workinghours'].timeOff?(iv)
-
       true
     end
 
+    # call-seq:
+    #   hasWorkingTime(startTime, endTime) -> true or false
+    #   hasWorkingTime(interval) -> true or false
+    #
+    # Return true if the interval overlaps with a globally defined working
+    # time or false if not. Global work time means, no global vacation defined
+    # and the slot lies within a defined global working time period.
+    def hasWorkingTime(*args)
+      # Normalize argument(s) to TimeInterval
+      if args.length == 1
+        if args[0].is_a?(TimeInterval)
+          startIdx = dateToIdx(args[0].start)
+          endIdx = dateToIdx(args[0].end)
+        else
+          raise ArgumentError, "Unsupported argument type #{args[0].class}"
+        end
+      else
+        startIdx = dateToIdx(args[0])
+        endIdx = dateToIdx(args[1])
+      end
+
+      startIdx.upto(endIdx) do |idx|
+        return true if @scoreboard[idx]
+      end
+
+      false
+    end
+
     # Convert working _seconds_ to working days. The result depends on the
     # setting of the global 'dailyworkinghours' attribute.
     def convertToDailyLoad(seconds)
@@ -881,6 +949,12 @@ class TaskJuggler
       slotsToDays(slots)
     end
 
+    # Return true if for the date specified by the global scoreboard index
+    # _sbIdx_ there is any resource that is available.
+    def anyResourceAvailable?(sbIdx)
+      @resourceAvailability[sbIdx]
+    end
+
     # TaskJuggler keeps all times in UTC. All time values must be multiples of
     # the used scheduling granularity. If the local time zone is not
     # hour-aligned to UTC, the maximum allowed schedule granularity is
@@ -959,8 +1033,7 @@ class TaskJuggler
       unless (rti = RichText.new(rText, RTFHandlers.create(self),
                                  @messageHandler).
                                  generateIntermediateFormat)
-        @messageHandler.warning('ptn_journal',
-                                "Syntax error in journal message")
+        warning('ptn_journal', "Syntax error in journal message: #{rText}")
         return nil
       end
       # No section numbers, please!
@@ -984,11 +1057,17 @@ class TaskJuggler
       str
     end
 
-    # This function sends an error message to the message handler.
-    def error(id, text)
-      @messageHandler.error(id, text)
+    # Generate an error message via the message handler.
+    def error(id, text, sourceFileInfo = nil)
+      @messageHandler.error(id, text, sourceFileInfo)
+    end
+
+    # Generate a warning message via the message handle.
+    def warning(id, text, sourceFileInfo = nil)
+      @messageHandler.warning(id, text, sourceFileInfo)
     end
 
+
   protected
 
     def prepareScenario(scIdx)
@@ -1017,11 +1096,17 @@ class TaskJuggler
       resources.each { |resource| resource.setDirectReports(scIdx) }
       resources.each { |resource| resource.setReports(scIdx) }
 
+      computeResourceAvailabilities(scIdx, usedResources)
+
+      Log.progress(0.81)
       tasks.each { |task| task.prepareScheduling(scIdx) }
+      Log.progress(0.82)
       tasks.each { |task| task.Xref(scIdx) }
       tasks.each { |task| task.propagateInitialValues(scIdx) }
+      Log.progress(0.83)
       tasks.each { |task| task.preScheduleCheck(scIdx) }
 
+      Log.progress(0.84)
       # Check for dependency loops in the task graph.
       tasks.each { |task| task.resetLoopFlags(scIdx) }
       tasks.each do |task|
@@ -1084,7 +1169,11 @@ class TaskJuggler
     # Schedule all tasks for the given Scenario with index +scIdx+.
     def scheduleScenario(scIdx)
       tasks = PropertyList.new(@tasks)
-      tasks.delete_if { |task| !task.leaf? }
+      # Only care about leaf tasks that are not milestones are aren't
+      # scheduled already (due to bookings).
+      tasks.delete_if { |task| !task.leaf? ||
+                               task['milestone', scIdx] ||
+                               task['scheduled', scIdx] }
 
       Log.enter('scheduleScenario', "#{tasks.length} leaf tasks")
       # The sorting of the work item list determines which tasks will get their
@@ -1104,50 +1193,58 @@ class TaskJuggler
       # true.
       Log.startProgressMeter("Scheduling scenario " +
                              "#{scenario(scIdx).get('name')}")
-      loop do
-        # The main scheduler loop only needs to look at the first task that is
-        # ready to be scheduled.
-        workItems = tasks.to_ary
-
-        # Count the already completed tasks.
-        completedTasks = 0
-        workItems.each do |task|
-          completedTasks += 1 if task['scheduled', scIdx]
+      failedTasks = []
+      while !tasks.empty?
+        # Only update the progress bar every 10 completed tasks.
+        if tasks.length % 10 == 0
+          percentComplete = (totalTasks - tasks.length).to_f / totalTasks
+          Log.progress(percentComplete)
         end
 
-        Log.progress(completedTasks.to_f / totalTasks)
-        # Remove all tasks that are not ready for scheduling yet.
-        workItems.delete_if { |task| !task.readyForScheduling?(scIdx) }
-
-        # Check if we are done.
-        break if workItems.empty?
+        # Now find the task with the highest priority that can be scheduled
+        # and schedule it.
+        taskToRemove = nil
+        tasks.each do |task|
+          # Task not ready? Ignore it.
+          next unless task.readyForScheduling?(scIdx)
+
+          if task.schedule(scIdx)
+            Log << "Task #{task.fullId}: #{task['start', scIdx]} -> " +
+                   "#{task['end', scIdx]}"
+          else
+            failedTasks << task
+          end
+          # The tasks has been completed or failed. But we can remove it from
+          # the todo list.
+          taskToRemove = task
+          # The scheduling of this task may cause other higher priority tasks
+          # to be ready now. So we terminate the inner loop and start at the
+          # top of the list again.
+          break
+        end
 
-        # The first task in the list is the one with the highes priority and
-        # the largest path criticalness that is ready to be scheduled.
-        task = workItems[0]
-        # Schedule it.
-        if task.schedule(scIdx)
-          Log << "Task #{task.fullId}: #{task['start', scIdx]} -> " +
-                 "#{task['end', scIdx]}"
+        # There should always be a task to be removed. If not, the scheduler
+        # has found a set of tasks that deadlock each other.
+        if taskToRemove
+          tasks.delete(taskToRemove)
+        else
+          tasks.each { |t| puts t.fullId }
+          raise 'Scheduler deadlock: Cannot schedule any further tasks'
         end
       end
-      unscheduledTasks = []
-      tasks.each { |t| unscheduledTasks << t unless t['scheduled', scIdx] }
 
-      # Check for unscheduled tasks and report the first 10 of them as
+      # Check for failed tasks and report the first 10 of them as
       # warnings.
-      unless unscheduledTasks.empty?
-        @messageHandler.warning(
-          'unscheduled_tasks',
-          "#{unscheduledTasks.length} tasks could not be scheduled")
+      unless failedTasks.empty?
+        warning('unscheduled_tasks',
+                "#{failedTasks.length} tasks could not be scheduled")
         i = 0
-        unscheduledTasks.each do |t|
-          @messageHandler.warning(
-            'unscheduled_task',
-            "Task #{t.fullId}: " +
-            "#{t['start', scIdx] ? t['start', scIdx] : '<?>'} -> " +
-            "#{t['end', scIdx] ? t['end', scIdx] : '<?>'}", nil, nil, t,
-            scenario(scIdx))
+        failedTasks.each do |t|
+          warning('unscheduled_task',
+                  "Task #{t.fullId}: " +
+                  "#{t['start', scIdx] ? t['start', scIdx] : '<?>'} -> " +
+                  "#{t['end', scIdx] ? t['end', scIdx] : '<?>'}",
+                  t.sourceFileInfo)
 
           i += 1
           break if i >= 10
@@ -1197,6 +1294,22 @@ class TaskJuggler
       end
     end
 
+    def computeResourceAvailabilities(scIdx, usedResources)
+      @resourceAvailability =
+        Scoreboard.new(@attributes['start'], @attributes['end'],
+                       @attributes['scheduleGranularity'])
+
+      @resourceAvailability.each_index do |idx|
+        usedResources.each do |resource|
+          if resource.available?(scIdx, idx)
+            @resourceAvailability[idx] = true
+            break
+          end
+        end
+      end
+    end
+
+
     def matchingReports(reportId)
       list = []
       @reports.each do |report|

data/lib/taskjuggler/ProjectFileParser.rb

@@ -132,8 +132,8 @@ class TaskJuggler
       end
     end
 
-    # Convenience function to check that an Interval fits completely within the
-    # project time frame.
+    # Convenience function to check that an TimeInterval fits completely
+    # within the project time frame.
     def checkInterval(iv)
       # Make sure the interval is within the project time frame.
       if iv.start < @project['start'] || iv.start >= @project['end']

data/lib/taskjuggler/ProjectFileScanner.rb

@@ -310,7 +310,7 @@ class TaskJuggler
       varName = envRef[2..-2]
 
       if (value = ENV[varName])
-        @cf.injectText(prefix + value)
+        @cf.injectText(prefix + value, envRef.length)
       else
         error('unknown_env_var', "Unknown environment variable '#{varName}'")
       end
@@ -362,11 +362,12 @@ class TaskJuggler
         prefix = ''
       end
 
-      # Remove '${' and '}'
-      argsStr = @macroCall[2..-2]
+      macroCallLength = @macroCall.length
+      # Remove '${' and '}' and white spaces at begin and end
+      argsStr = @macroCall[2..-2].sub(/^[ \t\n]*(.*?)[ \t\n]*$/, '\1')
       # Extract the macro name.
       if argsStr.index(' ').nil?
-        expandMacro(prefix, [ argsStr ])
+        expandMacro(prefix, [ argsStr ], macroCallLength)
       else
         macroName = argsStr[0, argsStr.index(' ')]
         # Remove the name part from argsStr
@@ -381,11 +382,11 @@ class TaskJuggler
         end
 
         unless scanner.eos?
-          raise "Junk found at end of macro: #{argsStr[scanner.pos..-1]}"
+          raise "Junk found at end of macro: #{scanner.post_match}"
         end
 
         # Expand the macro and inject it into the scanner.
-        expandMacro(prefix, [ macroName ] + args)
+        expandMacro(prefix, [ macroName ] + args, macroCallLength)
       end
 
       [ nil, '' ]

data/lib/taskjuggler/PropertySet.rb

@@ -178,11 +178,7 @@ class TaskJuggler
     def addProperty(property)
       # The PropertyTreeNode objects are indexed by ID or hierachical ID
       # depending on the name space setting of this set.
-      if @flatNamespace
-        @propertyMap[property.id] = property
-      else
-        @propertyMap[property.fullId] = property
-      end
+      @propertyMap[property.id] = property
       @properties << property
     end