Merge branch 'dev'

# Conflicts: # pom.xml
clarin-eric · Jan 16, 2025 · 5d64f2d · 5d64f2d
2 parents af03e49 + 33ba413
commit 5d64f2d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/curation-app/src/main/resources/application.yml b/curation-app/src/main/resources/application.yml
@@ -101,7 +101,7 @@ curation:
       - availability
       - temporalCoverage
    # maximum size of the CMD file. Bigger files are treated as non-processable
-   max_file_size: 100000
+   max_file_size: 100MB
    # maximum number CMDI instances in the processing queue when processing collection
    max_in_queue: ${MAX_IN_QUEUE:10}
    # URL of the web application

diff --git a/curation-app/src/main/resources/xslt/AllProfileReport2HTML.xsl b/curation-app/src/main/resources/xslt/AllProfileReport2HTML.xsl
@@ -31,11 +31,11 @@
 							<th>Id</th>
 							<th>Name</th>
 							<th>Public</th>
-							<th>CR resident</th>
+							<th>In component registry</th>
 							<th>Score</th>
 							<th>Collection Usage</th>
 							<th>Instance Usage</th>
-							<th>FacetCoverage</th>
+							<th>Facet Coverage</th>
 							<xsl:for-each select="./profile[1]/facets/facet">
 								<th>
 									<xsl:value-of select="functx:capitalize-first(@name)"/>

diff --git a/curation-app/src/main/resources/xslt/CMDProfileReport2HTML.xsl b/curation-app/src/main/resources/xslt/CMDProfileReport2HTML.xsl
@@ -104,7 +104,7 @@
 						<td><xsl:value-of select="./headerReport/public" /></td>
 					</tr>
 					<tr>
-						<th>CR resident</th>
+						<th>In component registry</th>
 						<td><xsl:value-of select="./headerReport/crResident" /></td>
 					</tr>
 				</table>

diff --git a/curation-web/src/main/resources/application-noSSL.yml b/curation-web/src/main/resources/application-noSSL.yml
@@ -55,7 +55,7 @@ curation:
          ${APPLICATION_HOME_DIRECTORY}/data/clarin/results/cmdi
       out: ${APPLICATION_HOME_DIRECTORY}/public
       share: /data
-   max_file_size: 100000000
+   max_file_size: 100MB
    mode: instance
    doc-url: "https://raw.githubusercontent.com/clarin-eric/cereal/main/curation-dashboard/markdown"         
 logging:

diff --git a/curation-web/src/main/resources/application.yml b/curation-web/src/main/resources/application.yml
@@ -69,7 +69,7 @@ curation:
       - availability
       - temporalCoverage
    clientUsername: curation   
-   max_file_size: 100000000
+   max_file_size: 100MB
    mode: instance
    doc-url: "https://raw.githubusercontent.com/clarin-eric/cereal/main/curation-dashboard/markdown"
    vlo_config_location: "${VLO_CONFIG_LOCATION}"      

diff --git a/curation-web/src/main/resources/xslt/CMDProfileReport2HTML.xsl b/curation-web/src/main/resources/xslt/CMDProfileReport2HTML.xsl
@@ -103,7 +103,7 @@
 							<td><xsl:value-of select="./headerReport/public" /></td>
 						</tr>
 						<tr>
-							<th>CR resident</th>
+							<th>In component registry</th>
 							<td><xsl:value-of select="./headerReport/crResident" /></td>
 						</tr>
 					</xsl:if>

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <linkchecker-persistence.version>2.0.0</linkchecker-persistence.version>
-        <revision>7.1.2</revision>
+        <revision>7.1.3-SNAPSHOT</revision>
         <vlo.version>4.12.1</vlo.version>
         <vtd.version>2.11</vtd.version>
         <saxon.version>12.3</saxon.version>