PMXML: handle files with more than 11 baselines

joniles · Nov 5, 2024 · 920605e · 920605e
1 parent 75683b2
commit 920605e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -5,10 +5,11 @@
 		<author email="jon@timephased.com">Jon Iles</author>
 	</properties>
 	<body>
-		<release date="unreleased" version="13.5.2">
+		<release date="unreleased" version="13.6.0">
 			<action dev="joniles" type="update">Added the `Task.getBaselineTask()` methods. For applications where a separate baseline schedule is present or a baseline has been manually added to the `ProjectFile` instance, these methods will allow you to access the underlying baseline task instance from the current task instance.</action>
 			<action dev="joniles" type="update">Added the Activity Percent Complete attribute to the `Task` class. The value of this attribute will be the Duration, Physical or Units percent complete value, based on the Percent Complete Type setting. This attribute is provided as a convenience to match the Activity Percent Complete type value shown in P6.</action>
 			<action dev="joniles" type="update">Improve retrieval of custom field values for certain MPP files.</action>
+			<action dev="joniles" type="update">Improve handling of PMXML files with more than 11 baselines.</action>
 		</release>
 		<release date="2024-10-28" version="13.5.1">
 			<action dev="joniles" type="update">Fix CVE-2024-49771: Potential Path Traversal Vulnerability (Contributed by yyjLF and sprinkle).</action>

diff --git a/src/main/java/net/sf/mpxj/primavera/PrimaveraPMFileReader.java b/src/main/java/net/sf/mpxj/primavera/PrimaveraPMFileReader.java
@@ -325,7 +325,7 @@ private void populateBaselines(APIBusinessObjects apibo, List<ProjectFile> proje
          if (apibo.getProjectList() != null && apibo.getProjectList().getProject().stream().anyMatch(p -> !p.getBaselineProject().isEmpty()))
          {
             // We have baselines in the project list
-            populateBaselinesbyProjectList(apibo, projects);
+            populateBaselinesByProjectList(apibo, projects);
          }
       }
    }
@@ -343,7 +343,7 @@ private void populateBaselinesByUniqueID(List<ProjectFile> projects)
       }
    }
 
-   private void populateBaselinesbyProjectList(APIBusinessObjects apibo, List<ProjectFile> projects)
+   private void populateBaselinesByProjectList(APIBusinessObjects apibo, List<ProjectFile> projects)
    {
       Map<Integer, ProjectFile> map = projects.stream().collect(Collectors.toMap(p -> p.getProjectProperties().getUniqueID(), p -> p));
       for (ProjectListType.Project project : apibo.getProjectList().getProject())
@@ -368,7 +368,14 @@ private void populateBaselinesbyProjectList(APIBusinessObjects apibo, List<Proje
             {
                continue;
             }
+
             parentProject.setBaseline(baselineProject, baselineIndex++);
+
+            // TODO: allow an arbitrary number of baselines to be captured
+            if (baselineIndex > 10)
+            {
+               break;
+            }
          }
       }
    }