# HG changeset patch # User bgruening # Date 1586440780 14400 # Node ID c4abd2c7d5f68852ea579ec10afe753ccf99adc0 # Parent fc199b60875d83b1ac2d1c39b992329fca680023 "planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/chemicaltoolbox/openbabel commit cda909c5e0b88fa3d12abe43fc72b8dd0729417a" diff -r fc199b60875d -r c4abd2c7d5f6 macros.xml --- a/macros.xml Wed Mar 25 16:41:26 2020 -0400 +++ b/macros.xml Thu Apr 09 09:59:40 2020 -0400 @@ -1,5 +1,5 @@ - 2.4.2.1 + 2.4.2.2 diff -r fc199b60875d -r c4abd2c7d5f6 ob_filter.py --- a/ob_filter.py Wed Mar 25 16:41:26 2020 -0400 +++ b/ob_filter.py Thu Apr 09 09:59:40 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: