Merge branch 'kitodo:master' into video-editor

Kitodo-API/src/main/java/org/kitodo/api/command/CommandInterface.java

@@ -16,11 +16,9 @@ public interface CommandInterface {
     /**
      * Runs a given command.
      *
-     * @param id
-     *            The id, to identify the command and it's results.
      * @param command
      *            The command as a String.
      * @return A commandResult, which contains id and result messages.
      */
-    CommandResult runCommand(Integer id, String command);
+    CommandResult runCommand(String command);
 }

Kitodo-API/src/main/java/org/kitodo/api/command/CommandResult.java

@@ -16,9 +16,6 @@
 
 public class CommandResult {
 
-    /** The id of the command. */
-    private Integer id;
-
     /** The command as a String. */
     private String command;
 
@@ -31,31 +28,19 @@ public class CommandResult {
     /**
      * Constructor.
      * 
-     * @param id
-     *            The id.
      * @param command
      *            The command.
      * @param successful
      *            If command was successful.
      * @param messages
      *            The resultMessages
      */
-    public CommandResult(Integer id, String command, boolean successful, List<String> messages) {
-        this.id = id;
+    public CommandResult(String command, boolean successful, List<String> messages) {
         this.command = command;
         this.successful = successful;
         this.messages = messages;
     }
 
-    /**
-     * Gets the id.
-     * 
-     * @return The id.
-     */
-    public Integer getId() {
-        return id;
-    }
-
     /**
      * Gets the command.
      * 
@@ -99,8 +84,7 @@ public boolean equals(Object object) {
         if (object instanceof CommandResult) {
             CommandResult that = (CommandResult) object;
 
-            return this.id.equals(that.id)
-                    && this.successful == that.successful
+            return this.successful == that.successful
                     && this.command.equals(that.command)
                     && this.messages.equals(that.messages);
         }
@@ -109,6 +93,6 @@ public boolean equals(Object object) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, successful, command, messages);
+        return Objects.hash(successful, command, messages);
     }
 }

Kitodo-Command/src/main/java/org/kitodo/command/Command.java

@@ -31,14 +31,12 @@ public class Command implements CommandInterface {
     /**
      * Method executes a script.
      *
-     * @param id
-     *            The id, to identify the command and it's results.
      * @param command
      *            The command as a String.
      * @return The command result.
      */
     @Override
-    public CommandResult runCommand(Integer id, String command) {
+    public CommandResult runCommand(String command) {
         CommandResult commandResult;
         Process process;
         String[] callSequence = command.split("[\\r\\n\\s]+");
@@ -53,26 +51,26 @@ public CommandResult runCommand(Integer id, String command) {
 
                 outputMessage.addAll(errorMessage);
 
-                commandResult = new CommandResult(id, command, errCode == 0, outputMessage);
+                commandResult = new CommandResult(command, errCode == 0, outputMessage);
                 if (commandResult.isSuccessful()) {
-                    logger.info("Execution of Command {} {} was successful!: {}", commandResult.getId(),
+                    logger.info("Execution of Command {} was successful!: {}",
                         commandResult.getCommand(), commandResult.getMessages());
                 } else {
-                    logger.error("Execution of Command {} {} failed!: {}", commandResult.getId(),
+                    logger.error("Execution of Command {} failed!: {}",
                         commandResult.getCommand(), commandResult.getMessages());
                 }
             }
         } catch (InterruptedException e) {
-            commandResult = new CommandResult(id, command, false, Collections.singletonList(e.getMessage()));
+            commandResult = new CommandResult(command, false, Collections.singletonList(e.getMessage()));
             logger.error("Execution of Command Thread was interrupted!");
             Thread.currentThread().interrupt();
             return commandResult;
         } catch (IOException e) {
             List<String> errorMessages = new ArrayList<>();
             errorMessages.add(e.getCause().toString());
             errorMessages.add(e.getMessage());
-            commandResult = new CommandResult(id, command, false, errorMessages);
-            logger.error("Execution of Command {} {} failed!: {}", commandResult.getId(), commandResult.getCommand(),
+            commandResult = new CommandResult(command, false, errorMessages);
+            logger.error("Execution of Command {} failed!: {}", commandResult.getCommand(),
                 commandResult.getMessages());
             return commandResult;
         }

Kitodo-Command/src/test/java/org/kitodo/command/CommandTest.java

@@ -31,7 +31,6 @@
 
 public class CommandTest {
     private static String scriptExtension;
-    private int processId = 3;
     private static boolean windows = false;
     private static File workingScript = new File(
             System.getProperty("user.dir") + "/src/test/resources/working_script.sh");
@@ -70,7 +69,7 @@ public void shouldRunCommand() {
         Command command = new Command();
 
         String commandString = "src/test/resources/working_script" + scriptExtension;
-        CommandResult commandResult = command.runCommand(processId, commandString);
+        CommandResult commandResult = command.runCommand(commandString);
 
         List<String> expectedMessages = new ArrayList<>();
         if (windows) {
@@ -80,7 +79,7 @@ public void shouldRunCommand() {
 
         expectedMessages.add("Hello World");
 
-        CommandResult expectedCommandResult = new CommandResult(processId, commandString, true, expectedMessages);
+        CommandResult expectedCommandResult = new CommandResult(commandString, true, expectedMessages);
 
         assertEquals("successful booleans of CommandResults are not identical", expectedCommandResult.isSuccessful(),
                 commandResult.isSuccessful());
@@ -95,9 +94,9 @@ public void shouldNotRunNotExistingCommand() {
         Command command = new Command();
 
         String commandString = "src/test/resources/notExistingScript" + scriptExtension;
-        CommandResult commandResult = command.runCommand(processId, commandString);
+        CommandResult commandResult = command.runCommand(commandString);
 
-        CommandResult expectedCommandResult = new CommandResult(processId, commandString, false, null);
+        CommandResult expectedCommandResult = new CommandResult(commandString, false, null);
 
         assertEquals("Should not run not existing Command", expectedCommandResult.isSuccessful(),
                 commandResult.isSuccessful());
@@ -108,9 +107,9 @@ public void shouldNotRunCommandWithFalseSyntax() {
         Command command = new Command();
 
         String commandString = "src/test/resources/not_working_script" + scriptExtension;
-        CommandResult commandResult = command.runCommand(processId, commandString);
+        CommandResult commandResult = command.runCommand(commandString);
 
-        CommandResult expectedCommandResult = new CommandResult(processId, commandString, false, null);
+        CommandResult expectedCommandResult = new CommandResult(commandString, false, null);
 
         assertEquals("Should not run command with false syntax", expectedCommandResult.isSuccessful(),
                 commandResult.isSuccessful());
@@ -121,7 +120,7 @@ public void shouldRunCommandWithParameter() {
         Command command = new Command();
 
         String commandString = "src/test/resources/working_script_with_parameters" + scriptExtension + " testParameter";
-        CommandResult commandResult = command.runCommand(processId, commandString);
+        CommandResult commandResult = command.runCommand(commandString);
 
         ArrayList<String> expectedMessages = new ArrayList<>();
 
@@ -132,7 +131,7 @@ public void shouldRunCommandWithParameter() {
 
         expectedMessages.add("testParameter");
 
-        CommandResult expectedCommandResult = new CommandResult(processId, commandString, true, expectedMessages);
+        CommandResult expectedCommandResult = new CommandResult(commandString, true, expectedMessages);
 
         assertEquals("successful booleans of CommandResults are not identical", expectedCommandResult.isSuccessful(),
                 commandResult.isSuccessful());

Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Process.java

@@ -116,6 +116,9 @@ public class Process extends BaseTemplateBean {
     @Column(name = "inChoiceListShown")
     Boolean inChoiceListShown;
 
+    @Column(name = "ocrd_workflow_id")
+    private String ocrdWorkflowId;
+
     @Transient
     private User blockedUser;
 
@@ -651,4 +654,23 @@ public void setNumberOfImages(int numberOfImages) {
     public void setNumberOfStructures(int numberOfStructures) {
         this.numberOfStructures = numberOfStructures;
     }
+
+    /**
+     * Get OCR-D workflow identifier.
+     *
+     * @return The OCR-D workflow identifier
+     */
+    public String getOcrdWorkflowId() {
+        return ocrdWorkflowId;
+    }
+
+    /**
+     * Set the OCR-D workflow identifier.
+     *
+     * @param ocrdWorkflowId
+     *         The identifier of the OCR-D workflow
+     */
+    public void setOcrdWorkflowId(String ocrdWorkflowId) {
+        this.ocrdWorkflowId = ocrdWorkflowId;
+    }
 }

Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Template.java

@@ -65,6 +65,9 @@ public class Template extends BaseTemplateBean {
                 @JoinColumn(name = "project_id", foreignKey = @ForeignKey(name = "FK_project_x_template_project_id")) })
     private List<Project> projects;
 
+    @Column(name = "ocrd_workflow_id")
+    private String ocrdWorkflowId;
+
     /**
      * Constructor.
      */
@@ -168,6 +171,26 @@ public void setWorkflow(Workflow workflow) {
         this.workflow = workflow;
     }
 
+
+    /**
+     * Get OCR-D workflow identifier.
+     *
+     * @return value of OCR-D workflow identifier
+     */
+    public String getOcrdWorkflowId() {
+        return ocrdWorkflowId;
+    }
+
+    /**
+     * Set the OCR-D workflow identifier.
+     *
+     * @param ocrdWorkflowId
+     *         The identifier of the OCR-D workflow
+     */
+    public void setOcrdWorkflowId(String ocrdWorkflowId) {
+        this.ocrdWorkflowId = ocrdWorkflowId;
+    }
+
     /**
      * Get projects list.
      *

Kitodo-DataManagement/src/main/resources/db/migration/V2_126__Add_authority_and_fields_for_ocrd_workflows.sql

@@ -0,0 +1,17 @@
+--
+-- (c) Kitodo. Key to digital objects e. V. <[email protected]>
+--
+-- This file is part of the Kitodo project.
+--
+-- It is licensed under GNU General Public License version 3 or later.
+--
+-- For the full copyright and license information, please read the
+-- GPL3-License.txt file that was distributed with this source code.
+--
+
+-- Add authority to assign OCR-D workflow in template or process details
+INSERT IGNORE INTO authority (title) VALUES ('assignOcrdWorkflow_clientAssignable');
+
+-- Add columns of OCR-D workflow identifier
+ALTER TABLE process ADD ocrd_workflow_id varchar(255) DEFAULT NULL;
+ALTER TABLE template ADD ocrd_workflow_id varchar(255) DEFAULT NULL;

Kitodo-FileManagement/src/main/java/org/kitodo/filemanagement/CommandService.java

@@ -14,16 +14,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import java.util.Random;
 
 import org.kitodo.api.command.CommandInterface;
 import org.kitodo.api.command.CommandResult;
 import org.kitodo.serviceloader.KitodoServiceLoader;
 
 class CommandService {
 
-    private Random random = new Random(1000000);
-
     /**
      * Method executes a script string.
      *
@@ -39,7 +36,7 @@ CommandResult runCommand(String script) throws IOException {
         KitodoServiceLoader<CommandInterface> serviceLoader = new KitodoServiceLoader<>(CommandInterface.class);
         CommandInterface command = serviceLoader.loadModule();
 
-        CommandResult commandResult = command.runCommand(random.nextInt(), script);
+        CommandResult commandResult = command.runCommand(script);
         List<String> commandResultMessages = commandResult.getMessages();
         if (commandResultMessages.size() > 0 && commandResultMessages.get(0).contains("IOException")) {
             throw new IOException(commandResultMessages.get(1));

Kitodo-FileManagement/src/main/java/org/kitodo/filemanagement/FileManagement.java

@@ -393,7 +393,7 @@ public URI createProcessLocation(String processId) throws IOException {
         File processRootDirectory = new File(KitodoConfig.getKitodoDataDirectory() + File.separator + processId);
         String scriptCreateDirMeta = KitodoConfig.getParameter("script_createDirMeta");
         String command = scriptCreateDirMeta + ' ' + processRootDirectory.getPath();
-        if (!processRootDirectory.exists() && !commandService.runCommand(command.hashCode(), command).isSuccessful()) {
+        if (!processRootDirectory.exists() && !commandService.runCommand(command).isSuccessful()) {
             throw new IOException("Could not create processRoot directory.");
         }
         return fileMapper.unmapUriFromKitodoDataDirectoryUri(Paths.get(processRootDirectory.getPath()).toUri());

Kitodo/src/main/java/org/kitodo/config/enums/ParameterCore.java

@@ -46,6 +46,12 @@ public enum ParameterCore implements ParameterInterface {
      */
     DIR_RULESETS(new Parameter<UndefinedParameter>("directory.rulesets")),
 
+    /**
+     * Absolute path to the directory that the OCR-D workflow files will be
+     * read from. It must be terminated by a directory separator ("/").
+     */
+    OCRD_WORKFLOWS_DIR(new Parameter<>("ocrd.workflows.directory", "")),
+
     /**
      * Absolute path to the directory that XSLT files are stored in which are used
      * to transform the "XML log" (as visible from the XML button in the processes
@@ -639,8 +645,12 @@ public enum ParameterCore implements ParameterInterface {
      * Secret is used to encrypt or decrypt LDAP manager passwords which are stored in the database in encrypted form.
      * Once the secret value is set, it should not be changed since encrypted data can no longer be decrypted.
      */
-    SECURITY_SECRET_LDAPMANAGERPASSWORD(new Parameter<>("security.secret.ldapManagerPassword", ""));
+    SECURITY_SECRET_LDAPMANAGERPASSWORD(new Parameter<>("security.secret.ldapManagerPassword", "")),
 
+    /* Optional parameter can be used to limit the number of processes for which media renaming can be conducted as a
+     * list function. Values different from positive integers are interpreted as "unlimited".
+     */
+    MAX_NUMBER_OF_PROCESSES_FOR_MEDIA_RENAMING(new Parameter<>("maxNumberOfProcessesForMediaRenaming", -1));
 
     private final Parameter<?> parameter;
 

Kitodo/src/main/java/org/kitodo/production/controller/SecurityAccessController.java

@@ -222,6 +222,15 @@ public boolean hasAuthorityToAddOnProjectPage() {
         return securityAccessService.hasAuthorityToAddOnProjectPage();
     }
 
+    /**
+     * Check if the current user has the authority to add OCR-D workflow.
+     *
+     * @return true if the current user has the authority to add OCR-D workflow.
+     */
+    public boolean hasAuthorityToAssignOcrdWorkflow() {
+        return securityAccessService.hasAuthorityToAssignOcrdWorkflow();
+    }
+
     /**
      * Check if the current user has the authority to delete the batch.
      *