From 02c84071df6254576f9f4a43fb0efaddcee3fc2d Mon Sep 17 00:00:00 2001
From: edalex-yinzi <yinzi.xie@edalex.com>
Date: Wed, 31 Jul 2024 09:18:01 +1000
Subject: [PATCH] fix: set export bucket format to false

---
 .../com/tle/core/hierarchy/convert/KeyResourceConverter.java  | 2 +-
 autotest/Tests/tests/acl/institution/keyresources/export.fmt  | 4 ++--
 autotest/Tests/tests/asc/institution/keyresources/export.fmt  | 4 ++--
 autotest/Tests/tests/cal/institution/keyresources/export.fmt  | 4 ++--
 .../Tests/tests/canvas/institution/keyresources/export.fmt    | 4 ++--
 .../tests/contribute/institution/keyresources/export.fmt      | 4 ++--
 .../Tests/tests/dinuk/institution/keyresources/export.fmt     | 3 +++
 .../Tests/tests/facet/institution/keyresources/export.fmt     | 4 ++--
 .../Tests/tests/fiveo/institution/keyresources/export.fmt     | 4 ++--
 .../Tests/tests/flakey/institution/keyresources/export.fmt    | 4 ++--
 .../tests/flickrindepth/institution/keyresources/export.fmt   | 3 +++
 .../Tests/tests/hierarchy/institution/keyresources/export.fmt | 4 ++--
 autotest/Tests/tests/ldap/institution/keyresources/export.fmt | 4 ++--
 .../Tests/tests/ldapad/institution/keyresources/export.fmt    | 4 ++--
 .../Tests/tests/login/institution/keyresources/export.fmt     | 3 +++
 .../tests/manageresources/institution/keyresources/export.fmt | 4 ++--
 .../Tests/tests/moodle/institution/keyresources/export.fmt    | 4 ++--
 .../tests/myresources/institution/keyresources/export.fmt     | 4 ++--
 .../tests/replicated/institution/keyresources/export.fmt      | 4 ++--
 .../Tests/tests/reporting/institution/keyresources/export.fmt | 4 ++--
 .../tests/rest/institution/keyresources/{77 => }/113997.xml   | 0
 .../tests/rest/institution/keyresources/{80 => }/116944.xml   | 0
 .../tests/rest/institution/keyresources/{28 => }/117276.xml   | 0
 .../tests/rest/institution/keyresources/{12 => }/15116.xml    | 0
 .../tests/rest/institution/keyresources/{95 => }/161887.xml   | 0
 .../tests/rest/institution/keyresources/{96 => }/161888.xml   | 0
 .../tests/rest/institution/keyresources/{127 => }/172415.xml  | 0
 autotest/Tests/tests/rest/institution/keyresources/export.fmt | 4 ++--
 .../Tests/tests/vanilla/institution/keyresources/export.fmt   | 4 ++--
 .../Tests/tests/workflow/institution/keyresources/export.fmt  | 4 ++--
 30 files changed, 48 insertions(+), 39 deletions(-)
 create mode 100644 autotest/Tests/tests/dinuk/institution/keyresources/export.fmt
 create mode 100644 autotest/Tests/tests/flickrindepth/institution/keyresources/export.fmt
 create mode 100644 autotest/Tests/tests/login/institution/keyresources/export.fmt
 rename autotest/Tests/tests/rest/institution/keyresources/{77 => }/113997.xml (100%)
 rename autotest/Tests/tests/rest/institution/keyresources/{80 => }/116944.xml (100%)
 rename autotest/Tests/tests/rest/institution/keyresources/{28 => }/117276.xml (100%)
 rename autotest/Tests/tests/rest/institution/keyresources/{12 => }/15116.xml (100%)
 rename autotest/Tests/tests/rest/institution/keyresources/{95 => }/161887.xml (100%)
 rename autotest/Tests/tests/rest/institution/keyresources/{96 => }/161888.xml (100%)
 rename autotest/Tests/tests/rest/institution/keyresources/{127 => }/172415.xml (100%)

diff --git a/Source/Plugins/Core/com.equella.core/src/com/tle/core/hierarchy/convert/KeyResourceConverter.java b/Source/Plugins/Core/com.equella.core/src/com/tle/core/hierarchy/convert/KeyResourceConverter.java
index f137dfc867..7d06b6f663 100644
--- a/Source/Plugins/Core/com.equella.core/src/com/tle/core/hierarchy/convert/KeyResourceConverter.java
+++ b/Source/Plugins/Core/com.equella.core/src/com/tle/core/hierarchy/convert/KeyResourceConverter.java
@@ -46,7 +46,7 @@ public void doExport(TemporaryFileHandle staging, Institution institution, Conve
     final SubTemporaryFile keyResourceExportFolder =
         new SubTemporaryFile(staging, KEY_RESOURCES_IMPORT_EXPORT_FOLDER);
     // write out the format details
-    xmlHelper.writeExportFormatXmlFile(keyResourceExportFolder, true);
+    xmlHelper.writeExportFormatXmlFile(keyResourceExportFolder, false);
 
     hierarchyDao
         .getAllKeyResources(institution)
diff --git a/autotest/Tests/tests/acl/institution/keyresources/export.fmt b/autotest/Tests/tests/acl/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/acl/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/acl/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/asc/institution/keyresources/export.fmt b/autotest/Tests/tests/asc/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/asc/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/asc/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/cal/institution/keyresources/export.fmt b/autotest/Tests/tests/cal/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/cal/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/cal/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/canvas/institution/keyresources/export.fmt b/autotest/Tests/tests/canvas/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/canvas/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/canvas/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/contribute/institution/keyresources/export.fmt b/autotest/Tests/tests/contribute/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/contribute/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/contribute/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/dinuk/institution/keyresources/export.fmt b/autotest/Tests/tests/dinuk/institution/keyresources/export.fmt
new file mode 100644
index 0000000000..524c086fd0
--- /dev/null
+++ b/autotest/Tests/tests/dinuk/institution/keyresources/export.fmt
@@ -0,0 +1,3 @@
+<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/facet/institution/keyresources/export.fmt b/autotest/Tests/tests/facet/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/facet/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/facet/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/fiveo/institution/keyresources/export.fmt b/autotest/Tests/tests/fiveo/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/fiveo/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/fiveo/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/flakey/institution/keyresources/export.fmt b/autotest/Tests/tests/flakey/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/flakey/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/flakey/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/flickrindepth/institution/keyresources/export.fmt b/autotest/Tests/tests/flickrindepth/institution/keyresources/export.fmt
new file mode 100644
index 0000000000..524c086fd0
--- /dev/null
+++ b/autotest/Tests/tests/flickrindepth/institution/keyresources/export.fmt
@@ -0,0 +1,3 @@
+<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/hierarchy/institution/keyresources/export.fmt b/autotest/Tests/tests/hierarchy/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/hierarchy/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/hierarchy/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/ldap/institution/keyresources/export.fmt b/autotest/Tests/tests/ldap/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/ldap/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/ldap/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/ldapad/institution/keyresources/export.fmt b/autotest/Tests/tests/ldapad/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/ldapad/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/ldapad/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/login/institution/keyresources/export.fmt b/autotest/Tests/tests/login/institution/keyresources/export.fmt
new file mode 100644
index 0000000000..524c086fd0
--- /dev/null
+++ b/autotest/Tests/tests/login/institution/keyresources/export.fmt
@@ -0,0 +1,3 @@
+<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/manageresources/institution/keyresources/export.fmt b/autotest/Tests/tests/manageresources/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/manageresources/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/manageresources/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/moodle/institution/keyresources/export.fmt b/autotest/Tests/tests/moodle/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/moodle/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/moodle/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/myresources/institution/keyresources/export.fmt b/autotest/Tests/tests/myresources/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/myresources/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/myresources/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/replicated/institution/keyresources/export.fmt b/autotest/Tests/tests/replicated/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/replicated/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/replicated/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/reporting/institution/keyresources/export.fmt b/autotest/Tests/tests/reporting/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/reporting/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/reporting/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/rest/institution/keyresources/77/113997.xml b/autotest/Tests/tests/rest/institution/keyresources/113997.xml
similarity index 100%
rename from autotest/Tests/tests/rest/institution/keyresources/77/113997.xml
rename to autotest/Tests/tests/rest/institution/keyresources/113997.xml
diff --git a/autotest/Tests/tests/rest/institution/keyresources/80/116944.xml b/autotest/Tests/tests/rest/institution/keyresources/116944.xml
similarity index 100%
rename from autotest/Tests/tests/rest/institution/keyresources/80/116944.xml
rename to autotest/Tests/tests/rest/institution/keyresources/116944.xml
diff --git a/autotest/Tests/tests/rest/institution/keyresources/28/117276.xml b/autotest/Tests/tests/rest/institution/keyresources/117276.xml
similarity index 100%
rename from autotest/Tests/tests/rest/institution/keyresources/28/117276.xml
rename to autotest/Tests/tests/rest/institution/keyresources/117276.xml
diff --git a/autotest/Tests/tests/rest/institution/keyresources/12/15116.xml b/autotest/Tests/tests/rest/institution/keyresources/15116.xml
similarity index 100%
rename from autotest/Tests/tests/rest/institution/keyresources/12/15116.xml
rename to autotest/Tests/tests/rest/institution/keyresources/15116.xml
diff --git a/autotest/Tests/tests/rest/institution/keyresources/95/161887.xml b/autotest/Tests/tests/rest/institution/keyresources/161887.xml
similarity index 100%
rename from autotest/Tests/tests/rest/institution/keyresources/95/161887.xml
rename to autotest/Tests/tests/rest/institution/keyresources/161887.xml
diff --git a/autotest/Tests/tests/rest/institution/keyresources/96/161888.xml b/autotest/Tests/tests/rest/institution/keyresources/161888.xml
similarity index 100%
rename from autotest/Tests/tests/rest/institution/keyresources/96/161888.xml
rename to autotest/Tests/tests/rest/institution/keyresources/161888.xml
diff --git a/autotest/Tests/tests/rest/institution/keyresources/127/172415.xml b/autotest/Tests/tests/rest/institution/keyresources/172415.xml
similarity index 100%
rename from autotest/Tests/tests/rest/institution/keyresources/127/172415.xml
rename to autotest/Tests/tests/rest/institution/keyresources/172415.xml
diff --git a/autotest/Tests/tests/rest/institution/keyresources/export.fmt b/autotest/Tests/tests/rest/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/rest/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/rest/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/vanilla/institution/keyresources/export.fmt b/autotest/Tests/tests/vanilla/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/vanilla/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/vanilla/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
diff --git a/autotest/Tests/tests/workflow/institution/keyresources/export.fmt b/autotest/Tests/tests/workflow/institution/keyresources/export.fmt
index a8eb45ab67..524c086fd0 100644
--- a/autotest/Tests/tests/workflow/institution/keyresources/export.fmt
+++ b/autotest/Tests/tests/workflow/institution/keyresources/export.fmt
@@ -1,3 +1,3 @@
 <com.tle.core.institution.convert.AbstractConverter_-FormatFile>
-  <bucketed>true</bucketed>
-</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
\ No newline at end of file
+  <bucketed>false</bucketed>
+</com.tle.core.institution.convert.AbstractConverter_-FormatFile>