From 9456af2cf487676c5a7d82c1fc1a316dcffe72bf Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <Giancarlo Panichi@panichipc>
Date: Mon, 1 Feb 2021 16:03:52 +0100
Subject: [PATCH] Updated for release 4.28

---
 .../dataanalysis/ecoengine/utils/Sha1.java    | 20 ++++++------
 .../ecoengine/utils/Transformations.java      | 32 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Sha1.java b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Sha1.java
index 60be5e7..5082a00 100644
--- a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Sha1.java
+++ b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Sha1.java
@@ -45,18 +45,18 @@ public class Sha1 {
 
 			// Bug
 			//
-			RE regex = new RE("[a-z]");
+			// RE regex = new RE("[a-z]");
+			// for (int i = 0; i < len; i++) {
+			// String chars = "" + filestring.charAt(i);
+			// boolean optioned = regex.match(chars);
+
+			// Fix
+			Pattern p = Pattern.compile("[a-z]");
+
 			for (int i = 0; i < len; i++) {
 				String chars = "" + filestring.charAt(i);
-				boolean optioned = regex.match(chars);
-
-				// Fix
-				// Pattern p = Pattern.compile("[a-z]");
-				//
-				// for (int i = 0; i < len; i++) {
-				// String chars = "" + filestring.charAt(i);
-				// Matcher m = p.matcher(chars);
-				// boolean optioned = m.matches();
+				Matcher m = p.matcher(chars);
+				boolean optioned = m.matches();
 
 				if (optioned) {
 					counter++;
diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java
index a0fa42a..88ba752 100644
--- a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java
+++ b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java
@@ -219,25 +219,25 @@ public class Transformations {
 					
 					//Bug RE
 					//
-					RE regexp = new RE("[^\\\\]\"");
-					boolean matching = regexp.match(phrase);
+					//RE regexp = new RE("[^\\\\]\"");
+					//boolean matching = regexp.match(phrase);
 					
-					if (matching) {
-					  int i0 = regexp.getParenStart(0);
-					  quoted = phrase.substring(0, i0 + 1).trim();
-					  phrase = phrase.substring(i0 + 2).trim();
-					}
+					//if (matching) {
+					//  int i0 = regexp.getParenStart(0);
+					// quoted = phrase.substring(0, i0 + 1).trim();
+					//  phrase = phrase.substring(i0 + 2).trim();
+					//}
 					
 					//Fix
-					//Pattern p = Pattern.compile("[^\\\\]\"");
-					//Matcher m = p.matcher(phrase);
-					//boolean matching = m.matches(); 
-					//
-					//if (matching) {
-					//	int i0 = m.start();
-					//	quoted = phrase.substring(0, i0 + 1).trim();
-					//	phrase = phrase.substring(i0 + 2).trim();
-					//}
+					Pattern p = Pattern.compile("[^\\\\]\"");
+					Matcher m = p.matcher(phrase);
+					boolean matching = m.matches(); 
+					
+					if (matching) {
+						int i0 = m.start();
+						quoted = phrase.substring(0, i0 + 1).trim();
+						phrase = phrase.substring(i0 + 2).trim();
+					}
 				}
 
 				if (phrase.startsWith(delimiter))