You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2023/03/01 10:48:36 UTC

[hop] branch master updated: fix #2486 Javascript transform: Couldn't parse Date field [timestamp] with value [20230228161206]

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 db2179cb65 fix #2486 Javascript transform: Couldn't parse Date field [timestamp] with value [20230228161206]
     new 29b8868410 Merge pull request #2487 from sramazzina/JS-BRANCH
db2179cb65 is described below

commit db2179cb65dcfd6635f467938fbe2fbf80a85989
Author: sramazzina <se...@serasoft.it>
AuthorDate: Tue Feb 28 16:36:02 2023 +0100

    fix #2486 Javascript transform: Couldn't parse Date field [timestamp] with value [20230228161206]
---
 .../transforms/javascript/ScriptValuesDialog.java  | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesDialog.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesDialog.java
index 0e4dbc289a..25ce26c4f2 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesDialog.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesDialog.java
@@ -976,26 +976,34 @@ public class ScriptValuesDialog extends BaseTransformDialog implements ITransfor
             boolean setValueMetaFormat = false;
             switch (valueMeta.getType()) {
               case IValueMeta.TYPE_DATE:
-                format = "yyyy/MM/dd HH:mm:ss";
-                setValueMetaFormat = true;
+                if (format == null) {
+                  format = "yyyy/MM/dd HH:mm:ss";
+                  setValueMetaFormat = true;
+                }
                 string = valueMeta.getString(new Date());
                 break;
               case IValueMeta.TYPE_STRING:
                 string = "test value test value";
                 break;
               case IValueMeta.TYPE_INTEGER:
-                format = "#";
-                setValueMetaFormat = true;
+                if (format == null) {
+                  format = "#";
+                  setValueMetaFormat = true;
+                }
                 string = valueMeta.getString(0L);
                 break;
               case IValueMeta.TYPE_NUMBER:
-                format = "#.#";
-                setValueMetaFormat = true;
+                if (format == null) {
+                  format = "#.#";
+                  setValueMetaFormat = true;
+                }
                 string = valueMeta.getString(0.0D);
                 break;
               case IValueMeta.TYPE_BIGNUMBER:
-                format = "#.#";
-                setValueMetaFormat = true;
+                if (format == null) {
+                  format = "#.#";
+                  setValueMetaFormat = true;
+                }
                 string = valueMeta.getString(BigDecimal.ZERO);
                 break;
               case IValueMeta.TYPE_BOOLEAN: