Accept invalid CCD component files, for now

src/category.cpp

@@ -857,6 +857,7 @@ bool category::is_valid() const
 				}
 				}
 				catch (const std::exception &e)
 				catch (const std::exception &e)
 				{
 				{
+					result = false;
 					m_validator->report_error("Error validating " + m_columns[cix].m_name + ": " + e.what(), false);
 					m_validator->report_error("Error validating " + m_columns[cix].m_name + ": " + e.what(), false);
 					continue;
 					continue;
 				}
 				}

src/compound.cpp

@@ -215,7 +215,8 @@ compound_atom compound::get_atom_by_atom_id(const std::string &atom_id) const
 bool compound::atoms_bonded(const std::string &atomId_1, const std::string &atomId_2) const
 bool compound::atoms_bonded(const std::string &atomId_1, const std::string &atomId_2) const
 {
 {
 	auto i = find_if(m_bonds.begin(), m_bonds.end(),
 	auto i = find_if(m_bonds.begin(), m_bonds.end(),
-		[&](const compound_bond &b) {
+		[&](const compound_bond &b)
+		{
 			return (b.atom_id[0] == atomId_1 and b.atom_id[1] == atomId_2) or (b.atom_id[0] == atomId_2 and b.atom_id[1] == atomId_1);
 			return (b.atom_id[0] == atomId_1 and b.atom_id[1] == atomId_2) or (b.atom_id[0] == atomId_2 and b.atom_id[1] == atomId_1);
 		});
 		});
 
 
@@ -226,39 +227,41 @@ bool compound::atoms_bonded(const std::string &atomId_1, const std::string &atom
 // known amino acids and bases
 // known amino acids and bases
 
 
 const std::map<std::string, char> compound_factory::kAAMap{
 const std::map<std::string, char> compound_factory::kAAMap{
-	{"ALA", 'A'},
-	{"ARG", 'R'},
-	{"ASN", 'N'},
-	{"ASP", 'D'},
-	{"CYS", 'C'},
-	{"GLN", 'Q'},
-	{"GLU", 'E'},
-	{"GLY", 'G'},
-	{"HIS", 'H'},
-	{"ILE", 'I'},
-	{"LEU", 'L'},
-	{"LYS", 'K'},
-	{"MET", 'M'},
-	{"PHE", 'F'},
-	{"PRO", 'P'},
-	{"SER", 'S'},
-	{"THR", 'T'},
-	{"TRP", 'W'},
-	{"TYR", 'Y'},
-	{"VAL", 'V'},
-	{"GLX", 'Z'},
-	{"ASX", 'B'}};
+	{ "ALA", 'A' },
+	{ "ARG", 'R' },
+	{ "ASN", 'N' },
+	{ "ASP", 'D' },
+	{ "CYS", 'C' },
+	{ "GLN", 'Q' },
+	{ "GLU", 'E' },
+	{ "GLY", 'G' },
+	{ "HIS", 'H' },
+	{ "ILE", 'I' },
+	{ "LEU", 'L' },
+	{ "LYS", 'K' },
+	{ "MET", 'M' },
+	{ "PHE", 'F' },
+	{ "PRO", 'P' },
+	{ "SER", 'S' },
+	{ "THR", 'T' },
+	{ "TRP", 'W' },
+	{ "TYR", 'Y' },
+	{ "VAL", 'V' },
+	{ "GLX", 'Z' },
+	{ "ASX", 'B' }
+};
 
 
 const std::map<std::string, char> compound_factory::kBaseMap{
 const std::map<std::string, char> compound_factory::kBaseMap{
-	{"A", 'A'},
-	{"C", 'C'},
-	{"G", 'G'},
-	{"T", 'T'},
-	{"U", 'U'},
-	{"DA", 'A'},
-	{"DC", 'C'},
-	{"DG", 'G'},
-	{"DT", 'T'}};
+	{ "A", 'A' },
+	{ "C", 'C' },
+	{ "G", 'G' },
+	{ "T", 'T' },
+	{ "U", 'U' },
+	{ "DA", 'A' },
+	{ "DC", 'C' },
+	{ "DG", 'G' },
+	{ "DT", 'T' }
+};
 
 
 // --------------------------------------------------------------------
 // --------------------------------------------------------------------
 // a factory class to generate compounds
 // a factory class to generate compounds
@@ -272,7 +275,7 @@ class compound_factory_impl : public std::enable_shared_from_this<compound_facto
 
 
 	virtual ~compound_factory_impl()
 	virtual ~compound_factory_impl()
 	{
 	{
-		for (auto c: m_compounds)
+		for (auto c : m_compounds)
 			delete c;
 			delete c;
 	}
 	}
 
 
@@ -334,7 +337,6 @@ class compound_factory_impl : public std::enable_shared_from_this<compound_facto
 	}
 	}
 
 
   protected:
   protected:
-
 	virtual compound *create(const std::string &id)
 	virtual compound *create(const std::string &id)
 	{
 	{
 		// For the base class we assume every compound is preloaded
 		// For the base class we assume every compound is preloaded
@@ -414,10 +416,18 @@ compound_factory_impl::compound_factory_impl(const fs::path &file, std::shared_p
 	else
 	else
 	{
 	{
 		// A CCD components file, validate it first
 		// A CCD components file, validate it first
+		try
+		{
 			cifFile.load_dictionary("mmcif_pdbx.dic");
 			cifFile.load_dictionary("mmcif_pdbx.dic");
 
 
 			if (not cifFile.is_valid())
 			if (not cifFile.is_valid())
-			throw std::runtime_error("Invalid compound file");
+				std::cerr << "The components file " << file << " is not valid" << std::endl;
+		}
+		catch (const std::exception &e)
+		{
+			std::cerr << "When trying to load the components file " << file << " there was an exception:" << std::endl
+					  << e.what() << std::endl;
+		}
 
 
 		for (auto &db : cifFile)
 		for (auto &db : cifFile)
 			m_compounds.push_back(new compound(db));
 			m_compounds.push_back(new compound(db));
@@ -430,7 +440,7 @@ compound_factory_impl::compound_factory_impl(const fs::path &file, std::shared_p
 class CCD_compound_factory_impl : public compound_factory_impl
 class CCD_compound_factory_impl : public compound_factory_impl
 {
 {
   public:
   public:
-	CCD_compound_factory_impl(std::shared_ptr<compound_factory_impl> next, const fs::path& file)
+	CCD_compound_factory_impl(std::shared_ptr<compound_factory_impl> next, const fs::path &file)
 		: compound_factory_impl(next)
 		: compound_factory_impl(next)
 		, mCompoundsFile(file)
 		, mCompoundsFile(file)
 	{
 	{
@@ -647,7 +657,6 @@ compound_factory::compound_factory()
 		m_impl.reset(new CCP4_compound_factory_impl(clibd_mon));
 		m_impl.reset(new CCP4_compound_factory_impl(clibd_mon));
 	else if (cif::VERBOSE > 0)
 	else if (cif::VERBOSE > 0)
 		std::cerr << "CCP4 monomers library not found, CLIBD_MON is not defined" << std::endl;
 		std::cerr << "CCP4 monomers library not found, CLIBD_MON is not defined" << std::endl;
-
 }
 }
 
 
 compound_factory::~compound_factory()
 compound_factory::~compound_factory()
@@ -729,4 +738,4 @@ bool compound_factory::is_known_base(const std::string &resName) const
 	return m_impl ? m_impl->is_known_base(resName) : kBaseMap.count(resName) > 0;
 	return m_impl ? m_impl->is_known_base(resName) : kBaseMap.count(resName) > 0;
 }
 }
 
 
-} // namespace pdbx
+} // namespace cif