This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 92f4399 HOP-3585 No result file in Process files with Move operation.
HOP-3670 Process filenames action returns wrong status. Minor refactoring on
costant name
new 4756921 Merge pull request #1266 from sramazzina/HOP-3525
92f4399 is described below
commit 92f43999647e8c32e849e149b59d2106a833925e
Author: Sergio Ramazzina <[email protected]>
AuthorDate: Mon Jan 10 12:11:52 2022 +0100
HOP-3585 No result file in Process files with Move operation.
HOP-3670 Process filenames action returns wrong status. Minor refactoring
on costant name
---
.../ActionCopyMoveResultFilenames.java | 7 ++++--
.../ActionCopyMoveResultFilenamesDialog.java | 4 ++--
.../transforms/processfiles/ProcessFiles.java | 2 +-
.../messages/messages_it_IT.properties | 28 +++++++++++-----------
4 files changed, 22 insertions(+), 19 deletions(-)
diff --git
a/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenames.java
b/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenames.java
index c1711a2..2ebe5fd 100644
---
a/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenames.java
+++
b/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenames.java
@@ -70,7 +70,7 @@ public class ActionCopyMoveResultFilenames extends ActionBase
implements Cloneab
private String destinationFolder;
private String nrErrorsLessThan;
- public String SUCCESS_IF_AT_LEAST_X_FILES_UN_ZIPPED =
"success_when_at_least";
+ public String SUCCESS_IF_AT_LEAST_X_FILES = "success_when_at_least";
public String SUCCESS_IF_ERRORS_LESS = "success_if_errors_less";
public String SUCCESS_IF_NO_ERRORS = "success_if_no_errors";
private String successCondition;
@@ -463,7 +463,7 @@ public class ActionCopyMoveResultFilenames extends
ActionBase implements Cloneab
if ((nrErrors == 0 && getSuccessCondition().equals(SUCCESS_IF_NO_ERRORS))
|| (nrSuccess >= limitFiles
- &&
getSuccessCondition().equals(SUCCESS_IF_AT_LEAST_X_FILES_UN_ZIPPED))
+ && getSuccessCondition().equals(SUCCESS_IF_AT_LEAST_X_FILES))
|| (nrErrors <= limitFiles &&
getSuccessCondition().equals(SUCCESS_IF_ERRORS_LESS))) {
retval = true;
}
@@ -539,6 +539,7 @@ public class ActionCopyMoveResultFilenames extends
ActionBase implements Cloneab
// Remove source file from result files list
result.getResultFiles().remove(sourcefile.toString());
+ nrSuccess++;
if (isDetailed()) {
logDetailed(
BaseMessages.getString(
@@ -570,6 +571,7 @@ public class ActionCopyMoveResultFilenames extends
ActionBase implements Cloneab
if (getAction().equals("copy")) {
// Copy file
FileUtil.copyContent(sourcefile, destinationfile);
+ nrSuccess++;
if (isDetailed()) {
logDetailed(
BaseMessages.getString(
@@ -581,6 +583,7 @@ public class ActionCopyMoveResultFilenames extends
ActionBase implements Cloneab
} else {
// Move file
sourcefile.moveTo(destinationfile);
+ nrSuccess++;
if (isDetailed()) {
logDetailed(
BaseMessages.getString(
diff --git
a/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java
b/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java
index 6a30ebf..fb2aebb 100644
---
a/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java
+++
b/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java
@@ -731,7 +731,7 @@ public class ActionCopyMoveResultFilenamesDialog extends
ActionDialog implements
}
if (action.getSuccessCondition() != null) {
- if
(action.getSuccessCondition().equals(action.SUCCESS_IF_AT_LEAST_X_FILES_UN_ZIPPED))
{
+ if
(action.getSuccessCondition().equals(action.SUCCESS_IF_AT_LEAST_X_FILES)) {
wSuccessCondition.select(1);
} else if
(action.getSuccessCondition().equals(action.SUCCESS_IF_ERRORS_LESS)) {
wSuccessCondition.select(2);
@@ -794,7 +794,7 @@ public class ActionCopyMoveResultFilenamesDialog extends
ActionDialog implements
action.setNrErrorsLessThan(wNrErrorsLessThan.getText());
if (wSuccessCondition.getSelectionIndex() == 1) {
- action.setSuccessCondition(action.SUCCESS_IF_AT_LEAST_X_FILES_UN_ZIPPED);
+ action.setSuccessCondition(action.SUCCESS_IF_AT_LEAST_X_FILES);
} else if (wSuccessCondition.getSelectionIndex() == 2) {
action.setSuccessCondition(action.SUCCESS_IF_ERRORS_LESS);
} else {
diff --git
a/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFiles.java
b/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFiles.java
index b17dd56..5c1c017 100644
---
a/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFiles.java
+++
b/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFiles.java
@@ -225,7 +225,7 @@ public class ProcessFiles extends
BaseTransform<ProcessFilesMeta, ProcessFilesDa
// add filename to result filenames?
if (meta.isAddResultFilenames()
&& meta.getOperationType() != ProcessFilesMeta.OPERATION_TYPE_DELETE
- && data.sourceFile.getType() == FileType.FILE) {
+ && data.targetFile.getType() == FileType.FILE) {
// Add this to the result file names...
ResultFile resultFile =
new ResultFile(
diff --git
a/plugins/transforms/processfiles/src/main/resources/org/apache/hop/pipeline/transforms/processfiles/messages/messages_it_IT.properties
b/plugins/transforms/processfiles/src/main/resources/org/apache/hop/pipeline/transforms/processfiles/messages/messages_it_IT.properties
index 7ebc2d7..6d1ddda 100644
---
a/plugins/transforms/processfiles/src/main/resources/org/apache/hop/pipeline/transforms/processfiles/messages/messages_it_IT.properties
+++
b/plugins/transforms/processfiles/src/main/resources/org/apache/hop/pipeline/transforms/processfiles/messages/messages_it_IT.properties
@@ -17,18 +17,18 @@
#
#
#
-ProcessFilesMeta.CheckResult.NoInpuReceived=Nessun input ricevuto dagli altri
passi\!
-ProcessFiles.Log.FileAddedResult=Il file \u00E8 stato letto da un passo
Processa file
+ProcessFilesMeta.CheckResult.NoInpuReceived=Nessun input ricevuto dagli altri
transforms\!
+ProcessFiles.Log.FileAddedResult=Il file \u00E8 stato letto dal transform
Process file
ProcessFilesDialog.Log.GettingKeyInfo=prelievo informazioni chiave...
-ProcessFilesDialog.OverwriteTarget.Tooltip=Sovrascrivi il file di destinazione
-ProcessFilesDialog.CreateParentFolder.Tooltip=Crea la cartella padre di
destinazione se necessario
+ProcessFilesDialog.OverwriteTarget.Tooltip=Se esiste, sovrascrive il file di
destinazione
+ProcessFilesDialog.CreateParentFolder.Tooltip=Se necessario, crea la cartella
padre relativa alla destinazione
ProcessFilesDialog.TargetFileNameField.Label=Campo nome file di destinazione
-ProcessFiles.Error.TargetFileNotFile=Il file di destinazione [{0}] deve essere
dato come file (\u00E8 probabile che sia una cartella esistente)\!
+ProcessFiles.Error.TargetFileNotFile=La destinazione [{0}] deve essere data
come un file (probabilmente \u00E8 una cartella esistente)\!
ProcessFiles.Log.SourceFileCopied=Il file sorgente [{0}] \u00E8 stato copiato
in [{1}]
-ProcessFilesDialog.Simulate.Tooltip=Se viene selezionata quest''opzione, i
file non verranno copiati/spostati/cancellati.\nVerr\u00E0 eseguito il
controllo sui file (esistenza, cartella padre) ed verranno mostrati i messaggi.
-ProcessFiles.Error.SourceFileNotFile=Il file sorgente [{0}] non \u00E8 un file
(probabilmente una cartella)\!
+ProcessFilesDialog.Simulate.Tooltip=Se \u00E8 questa opzione, i file non
verranno copiati/spostati/cancellati.\nVerr\u00E0 solo eseguito il controllo
sui file (esistenza, cartella padre) ed eventualmente verranno mostrati
messaggi informativi.
+ProcessFiles.Error.SourceFileNotFile=Il file sorgente [{0}] non \u00E8 un file
(probabilmente \u00E8 una cartella)\!
ProcessFiles.Error.CanNotDeleteFile=Impossibile cancellare il file [{0}]
-ProcessFiles.Error.TargetParentFolderNotExists=Impossibile trovare la cartella
padre di destinazione [{0}]\!
+ProcessFiles.Error.TargetParentFolderNotExists=Impossibile trovare la cartella
padre per la posizione di destinazione [{0}]\!
ProcessFilesDialog.CreateParentFolder.Label=Crea la cartella padre di
destinazione
ProcessFilesDialog.AddResult.Tooltip=Aggiungi il nome file di destinazione al
risultato
ProcessFilesMeta.operationType.Move=Muovi
@@ -36,21 +36,21 @@ ProcessFiles.LineNumber=linea n\u00B0 {0}
ProcessFilesDialog.SourceFileNameField.Label=Campo nome file sorgente
ProcessFiles.Error.TargetFilenameFieldMissing=Manca il nome del file di
destinazione\!
ProcessFiles.Log.SourceFileMoved=Il file sorgente [{0}] \u00E8 stato spostato
in [{1}]
-ProcessFilesDialog.FailedToGetFields.DialogMessage=Impossibile prelevare i
campi dai passi precedenti a causa di un errore
+ProcessFilesDialog.FailedToGetFields.DialogMessage=Impossibile prelevare i
campi dai transforms precedenti a causa di un errore
ProcessFiles.Exception.CouldnotFindField=Impossibile trovare il campo ''{0}''
nella riga\!
-ProcessFilesMeta.CheckResult.ReceivingInfoFromOtherTransforms=Il passo sta
ricevendo informazioni dagli altri passi.
+ProcessFilesMeta.CheckResult.ReceivingInfoFromOtherTransforms=Il transform sta
ricevendo informazioni dagli altri transforms.
ProcessFiles.Error.SourceFileEmpty=Il nome del file sorgente \u00E8 vuoto\!
ProcessFilesMeta.CheckResult.SourceFileFieldMissing=Manca il campo col nome
file sorgente\!
ProcessFilesDialog.Shell.Title=Processa i file
-ProcessFilesDialog.Simulate.Label=Imposta la modalit\u00E0 simulazione
+ProcessFilesDialog.Simulate.Label=Imposta la modalit\u00E0 di simulazione
ProcessFilesMeta.operationType.Delete=Cancella
ProcessFilesMeta.CheckResult.TargetFileFieldMissing=Manca il campo col nome
file di destinazione\!
-ProcessFilesDialog.TransformName.Label=Nome del passo
+ProcessFilesDialog.TransformName.Label=Nome del transform
ProcessFiles.Log.TargetNotOverwritten=Il file {1} non \u00E8 stato
sovrascritto da {0}.
ProcessFilesDialog.Operation.Label=Operazione
ProcessFiles.Log.FilenameAddResult=Il nome file [{0}] \u00E8 stato aggiunto al
nome file del risultato.
ProcessFiles.Error.SourceFileNotExist=Impossibile trovare il file sorgente
[{0}]
-ProcessFiles.ErrorInTransformRunning=A causa di un errore, questo passo non
pu\u00F2 contuinuare\:
+ProcessFiles.ErrorInTransformRunning=A causa di un errore, questo transform
non pu\u00F2 contuinuare\:
ProcessFiles.Log.TargetFileExists=Il file di destinazione [{0}] esiste.
ProcessFiles.Log.UnexpectedError=Errore inatteso in ''
ProcessFilesDialog.OverwriteTarget.Label=Sovrascrivi il file di destinazione
@@ -63,6 +63,6 @@ ProcessFiles.Error.TargetFileEmpty=Il nome del file di
destinazione \u00E8 vuoto
ProcessFilesMeta.CheckResult.SourceFileFieldOK=Il campo col nome file sorgente
\u00E8 stato specificato\!
ProcessFilesDialog.FailedToGetFields.DialogTitle=Prelievo dei campi fallito
ProcessFiles.Log.SourceFileDeleted=Il file sorgente [{0}] \u00E8 stato
cancellato.
-ProcessFilesMeta.Exception.UnableToReadTransformMeta=Impossibile leggere le
informazioni del passo da XML
+ProcessFilesMeta.Exception.UnableToReadTransformMeta=Impossibile leggere le
informazioni del transform da XML
ProcessFilesMeta.operationType.Copy=Copia
ProcessFilesDialog.wSettingsGroup.Label=Impostazioni
