diff --git a/pom.xml b/pom.xml index 33a3192..a3573ce 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.dataanalysis ecological-engine - 1.14.1-SNAPSHOT + 1.14.0 ecological-engine ecological-engine library 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 98bcf6d..60be5e7 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Sha1.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/utils/Sha1.java @@ -42,22 +42,21 @@ public class Sha1 { int len = filestring.length(); int counter = 0; String cacheDir = ""; - - //Bug + + // Bug // - //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]"); - + RE regex = new RE("[a-z]"); for (int i = 0; i < len; i++) { String chars = "" + filestring.charAt(i); - Matcher m = p.matcher(chars); - boolean optioned = m.matches(); + 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(); 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 24e9e0a..a0fa42a 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); - // - //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(); + RE regexp = new RE("[^\\\\]\""); + boolean matching = regexp.match(phrase); if (matching) { - int i0 = m.start(); - quoted = phrase.substring(0, i0 + 1).trim(); - phrase = phrase.substring(i0 + 2).trim(); + 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(); + //} } if (phrase.startsWith(delimiter))