diff --git a/src/cli/cifschema/index.ts b/src/cli/cifschema/index.ts index 84c5a98972ac326bb58bb8866272485e69073076..b2704cc791779633b3fda0ef79a4146edb43eb6c 100644 --- a/src/cli/cifschema/index.ts +++ b/src/cli/cifschema/index.ts @@ -39,21 +39,12 @@ async function runGenerateSchemaMmcif(name: string, fieldNamesPath: string, type const maDic = await parseCifText(fs.readFileSync(MA_DIC_PATH, 'utf8')).run(); if (maDic.isError) throw maDic; - await ensureCarbBranchDicAvailable(); - const carbBranchDic = await parseCifText(fs.readFileSync(CARB_BRANCH_DIC_PATH, 'utf8')).run(); - if (carbBranchDic.isError) throw carbBranchDic; - - await ensureCarbCompDicAvailable(); - const carbCompDic = await parseCifText(fs.readFileSync(CARB_COMP_DIC_PATH, 'utf8')).run(); - if (carbCompDic.isError) throw carbCompDic; - const mmcifDicVersion = getDicVersion(mmcifDic.result.blocks[0]); const ihmDicVersion = getDicVersion(ihmDic.result.blocks[0]); const maDicVersion = getDicVersion(maDic.result.blocks[0]); - const carbDicVersion = 'draft'; - const version = `Dictionary versions: mmCIF ${mmcifDicVersion}, IHM ${ihmDicVersion}, MA ${maDicVersion}, CARB ${carbDicVersion}.`; + const version = `Dictionary versions: mmCIF ${mmcifDicVersion}, IHM ${ihmDicVersion}, MA ${maDicVersion}.`; - const frames: CifFrame[] = [...mmcifDic.result.blocks[0].saveFrames, ...ihmDic.result.blocks[0].saveFrames, ...maDic.result.blocks[0].saveFrames, ...carbBranchDic.result.blocks[0].saveFrames, ...carbCompDic.result.blocks[0].saveFrames]; + const frames: CifFrame[] = [...mmcifDic.result.blocks[0].saveFrames, ...ihmDic.result.blocks[0].saveFrames, ...maDic.result.blocks[0].saveFrames]; const schema = generateSchema(frames); await runGenerateSchema(name, version, schema, fieldNamesPath, typescript, out, moldbImportPath, addAliases); @@ -145,8 +136,6 @@ async function getFieldNamesFilter(fieldNamesPath: string): Promise<Filter> { async function ensureMmcifDicAvailable() { await ensureDicAvailable(MMCIF_DIC_PATH, MMCIF_DIC_URL); } async function ensureIhmDicAvailable() { await ensureDicAvailable(IHM_DIC_PATH, IHM_DIC_URL); } async function ensureMaDicAvailable() { await ensureDicAvailable(MA_DIC_PATH, MA_DIC_URL); } -async function ensureCarbBranchDicAvailable() { await ensureDicAvailable(CARB_BRANCH_DIC_PATH, CARB_BRANCH_DIC_URL); } -async function ensureCarbCompDicAvailable() { await ensureDicAvailable(CARB_COMP_DIC_PATH, CARB_COMP_DIC_URL); } async function ensureCifCoreDicAvailable() { await ensureDicAvailable(CIF_CORE_DIC_PATH, CIF_CORE_DIC_URL); await ensureDicAvailable(CIF_CORE_ENUM_PATH, CIF_CORE_ENUM_URL); @@ -173,10 +162,6 @@ const IHM_DIC_PATH = `${DIC_DIR}/ihm-extension.dic`; const IHM_DIC_URL = 'https://raw.githubusercontent.com/ihmwg/IHM-dictionary/master/ihm-extension.dic'; const MA_DIC_PATH = `${DIC_DIR}/ma-extension.dic`; const MA_DIC_URL = 'https://raw.githubusercontent.com/ihmwg/MA-dictionary/master/mmcif_ma.dic'; -const CARB_BRANCH_DIC_PATH = `${DIC_DIR}/entity_branch-extension.dic`; -const CARB_BRANCH_DIC_URL = 'https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/dict/entity_branch-extension.dic'; -const CARB_COMP_DIC_PATH = `${DIC_DIR}/chem_comp-extension.dic`; -const CARB_COMP_DIC_URL = 'https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/dict/chem_comp-extension.dic'; const CIF_CORE_DIC_PATH = `${DIC_DIR}/cif_core.dic`; const CIF_CORE_DIC_URL = 'https://raw.githubusercontent.com/COMCIFS/cif_core/master/cif_core.dic'; diff --git a/src/mol-io/reader/cif/schema/mmcif.ts b/src/mol-io/reader/cif/schema/mmcif.ts index 6a0c57a31f7668bbfe567f84443d422ab4daa23d..fc8dfc233c1100f66cdd96461cd2d818c60274b8 100644 --- a/src/mol-io/reader/cif/schema/mmcif.ts +++ b/src/mol-io/reader/cif/schema/mmcif.ts @@ -1,7 +1,7 @@ /** * Copyright (c) 2017-2020 mol* contributors, licensed under MIT, See LICENSE file for more info. * - * Code-generated 'mmCIF' schema file. Dictionary versions: mmCIF 5.352, IHM 1.17, MA 1.3.3, CARB draft. + * Code-generated 'mmCIF' schema file. Dictionary versions: mmCIF 5.353, IHM 1.17, MA 1.3.3. * * @author molstar/ciftools package */