# HG changeset patch
# User bgruening
# Date 1586441431 14400
# Node ID 015ccbd1ad6806ff7a146c8914f7de1ea95aed11
# Parent  b8838a9aa31a7e85a34ea3c6841cdcf12fdf45b5
"planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/chemicaltoolbox/openbabel commit cda909c5e0b88fa3d12abe43fc72b8dd0729417a"

diff -r b8838a9aa31a -r 015ccbd1ad68 macros.xml
--- a/macros.xml	Wed Mar 25 16:50:17 2020 -0400
+++ b/macros.xml	Thu Apr 09 10:10:31 2020 -0400
@@ -1,5 +1,5 @@
 <macros>
-    <token name="@VERSION@">2.4.2.1</token>
+    <token name="@VERSION@">2.4.2.2</token>
 
     <xml name="requirements">
         <requirements>
diff -r b8838a9aa31a -r 015ccbd1ad68 ob_filter.py
--- a/ob_filter.py	Wed Mar 25 16:50:17 2020 -0400
+++ b/ob_filter.py	Thu Apr 09 10:10:31 2020 -0400
@@ -40,7 +40,7 @@
     for mol in pybel.readfile('sdf', args.input):
         for key, elem in filters.items():
             # map the short description to the larger metadata names stored in the sdf file
-            property = cheminfolib.ColumnNames[key]
+            property = cheminfolib.ColumnNames.get(key, key)
             min = elem[0]
             max = elem[1]
             if float(mol.data[property]) >= float(min) and float(mol.data[property]) <= float(max):
@@ -113,7 +113,7 @@
         # Check if the sdf file contains all of the required metadata to invoke the precalculation filtering
         mol = next(pybel.readfile('sdf', args.input))
         for key, elem in filters.items():
-            property = cheminfolib.ColumnNames[key]
+            property = cheminfolib.ColumnNames.get(key, key)
             if not property in mol.data:
                 break
         else: