From c1f4931b2bcacb69c82b3c3c633828b504b63743 Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Wed, 20 Jul 2011 14:01:07 +0200
Subject: [PATCH] MMCifParser: Removed checks for no. of columns, since this is
supposed to happen already in the StarParser
---
modules/io/src/mol/mmcif_reader.cc | 17 -----------------
modules/io/src/mol/mmcif_reader.hh | 8 --------
2 files changed, 25 deletions(-)
diff --git a/modules/io/src/mol/mmcif_reader.cc b/modules/io/src/mol/mmcif_reader.cc
index a5233dca4..0a463ac24 100644
--- a/modules/io/src/mol/mmcif_reader.cc
+++ b/modules/io/src/mol/mmcif_reader.cc
@@ -141,20 +141,6 @@ bool MMCifParser::OnBeginLoop(const StarLoopDesc& header)
return false;
}
-bool MMCifParser::EnsureEnoughColumns(const std::vector<StringRef>& columns,
- size_t size)
-{
- if (columns.size() < size) {
- if (profile_.fault_tolerant) {
- return false;
- }
- throw IOException(this->FormatDiagnostic(STAR_DIAG_ERROR,
- "Not enough data fields",
- this->GetCurrentLinenum()));
- }
- return true;
-}
-
mol::ResNum to_res_num(int num, char ins_code)
{
return mol::ResNum(num, ins_code==' ' ? '\0' : ins_code);
@@ -207,9 +193,6 @@ bool MMCifParser::ParseAtomIdent(const std::vector<StringRef>& columns,
void MMCifParser::ParseAndAddAtom(const std::vector<StringRef>& columns)
{
- if (!this->EnsureEnoughColumns(columns, 12)) {
- return;
- }
mol::XCSEditor editor=ent_handle_.EditXCS(mol::BUFFERED_EDIT); // potbl
char alt_loc=0;
String chain_name;
diff --git a/modules/io/src/mol/mmcif_reader.hh b/modules/io/src/mol/mmcif_reader.hh
index b9a191a16..6f933ae12 100644
--- a/modules/io/src/mol/mmcif_reader.hh
+++ b/modules/io/src/mol/mmcif_reader.hh
@@ -125,14 +125,6 @@ public:
/// \return true for a valid id, false otherwise
bool IsValidPDBIdent(const StringRef& pdbid);
- /// \brief Check no. of columns available.
- ///
- /// \param columns fields
- /// \param size required no. of columns
- ///
- /// \return true if there are enough columns, false otherwise
- bool EnsureEnoughColumns(const std::vector<StringRef>& columns, size_t size);
-
/// \brief ...
///
/// \param columns data row
--
GitLab