units related to the value (e.g. percentage) are not shown, fix bar a…

…s it should be lowercase #111
lfoppiano · Jan 18, 2023 · f073d3e · f073d3e
1 parent 01bd319
commit f073d3e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/grobid/core/data/Quantity.java b/src/main/java/org/grobid/core/data/Quantity.java
@@ -253,8 +253,11 @@ public String toJson() {
             } else {
                 json.append(", ");
             }
-            json.append("\"normalizedQuantity\" : " + normalizedQuantity.getValue() + ",");
-            json.append("\"normalizedUnit\" : " + normalizedQuantity.getUnit().toJson());
+            json.append("\"normalizedQuantity\" : " + normalizedQuantity.getValue());
+            if (normalizedQuantity.getUnit() != null) {
+                json.append(", ");
+                json.append("\"normalizedUnit\" : " + normalizedQuantity.getUnit().toJson());
+            }
         }
 
         if (hasOffset()) {

diff --git a/src/main/java/org/grobid/core/data/normalization/QuantityNormalizer.java b/src/main/java/org/grobid/core/data/normalization/QuantityNormalizer.java
@@ -87,7 +87,9 @@ public Quantity.Normalized normalizeQuantity(Quantity quantity) throws Normaliza
         Quantity.Normalized normalizedQuantity = new Quantity().new Normalized();
 
         normalizedQuantity.setRawValue(quantity.getRawValue());
-        normalizedQuantity.setUnit(new Unit(unit.getSystemUnit().toString()));
+        if (StringUtils.isNotBlank(unit.getSystemUnit().getSymbol())) {
+            normalizedQuantity.setUnit(new Unit(unit.getSystemUnit().toString()));
+        }
         try {
             if (quantity.getParsedValue() != null) {
                 BigDecimal converted = new BigDecimal(unit.getConverterTo(unit.getSystemUnit()).convert(quantity.getParsedValue().getNumeric()).toString());

diff --git a/src/main/resources/lexicon/en/units.json b/src/main/resources/lexicon/en/units.json
@@ -1558,7 +1558,7 @@
     {
       "notations": [
         {
-          "raw": "Bar"
+          "raw": "bar"
         }
       ],
       "type": "PRESSURE",