From cababf611891cbe96ec12ce8898d9ea9d439b6d6 Mon Sep 17 00:00:00 2001 From: Andreas Romeyke <andreas.romeyke@slub-dresden.de> Date: Fri, 15 Mar 2024 11:21:01 +0100 Subject: [PATCH] - added new plugin param "BUFF_SIZE" to not infer with "BLOCK_SIZE" of 8192 requested by ExL SC07081803 --- PLUGIN-INF/metadata_SLUBStoragePlugin.xml | 15 ++++++++++++++- .../plugin/storage/nfs/SLUBStoragePlugin.java | 8 ++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/PLUGIN-INF/metadata_SLUBStoragePlugin.xml b/PLUGIN-INF/metadata_SLUBStoragePlugin.xml index daf132f..f7ee169 100644 --- a/PLUGIN-INF/metadata_SLUBStoragePlugin.xml +++ b/PLUGIN-INF/metadata_SLUBStoragePlugin.xml @@ -26,6 +26,19 @@ <label>ui.storage.nfs.fileBlockSize</label> <ui_tool_tip>BlockSize in Bytes</ui_tool_tip> <single>false</single> + <default_value>8192</default_value> + <mandatory>true</mandatory> + <validator_class_name>com.exlibris.core.infra.web.utils.formBuilder.validator.NumericFormValidator</validator_class_name> + <x_logic_type>String</x_logic_type> + <x_ui_type>TextField</x_ui_type> + <css_class>width40</css_class> + <x_options></x_options> + </x_field> + <x_field> + <field_name>BUFF_SIZE</field_name> + <label>ui.storage.nfs.fileBufferSize</label> + <ui_tool_tip>BufferSize in Bytes</ui_tool_tip> + <single>false</single> <default_value>1048576</default_value> <mandatory>true</mandatory> <validator_class_name>com.exlibris.core.infra.web.utils.formBuilder.validator.NumericFormValidator</validator_class_name> @@ -70,7 +83,7 @@ </fr:x_form> </pl:initParameters> <pl:description>SLUB Storage Plugin</pl:description> - <pl:version>2.95</pl:version> + <pl:version>2.96</pl:version> <pl:materialType>DIGITAL</pl:materialType> <pl:module>Repository</pl:module> <pl:generalType>TASK</pl:generalType> diff --git a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java index 7e29eed..860ba9c 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java +++ b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java @@ -113,20 +113,20 @@ public class SLUBStoragePlugin extends AbstractStorageHandler { private int getBlockSize () { if (0 == this.blocksize) { - String blocksizeStr = this.parameters.get("BLOCK_SIZE"); + String blocksizeStr = this.parameters.get("BUFF_SIZE"); if (null != blocksizeStr) { try { this.blocksize = Integer.parseInt(blocksizeStr); log.info("Set blocksize to " + this.blocksize); } catch (NumberFormatException e) { - log.error("Could not convert BLOCK_SIZE string to int, " + e.getMessage()); + log.error("Could not convert BUFF_SIZE string to int, " + e.getMessage()); } if (this.blocksize <= 0) { - log.error("BLOCK_SIZE needs to be greater than 0!"); + log.error("BUFF_SIZE needs to be greater than 0!"); } } else { this.blocksize = 1024*1024; - log.info("Could not retrieve BLOCK_SIZE, using default of " + this.blocksize + " Bytes") ; + log.info("Could not retrieve BUFF_SIZE, using default of " + this.blocksize + " Bytes") ; } } return this.blocksize; -- GitLab