diff --git a/src/codecs/jats/__file_snapshots__/48c60452-6c66-1014-adf9-c7b61873ecd3.json b/src/codecs/jats/__file_snapshots__/48c60452-6c66-1014-adf9-c7b61873ecd3.json index e1465e67b..91438a6c0 100644 --- a/src/codecs/jats/__file_snapshots__/48c60452-6c66-1014-adf9-c7b61873ecd3.json +++ b/src/codecs/jats/__file_snapshots__/48c60452-6c66-1014-adf9-c7b61873ecd3.json @@ -16,7 +16,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Plant Biology, University of California" + "name": "Department of Plant Biology, University of California, One Shields Avenue, Davis, CA 95616" } ], "familyNames": [ @@ -36,7 +36,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Plant Biology, University of California" + "name": "Department of Plant Biology, University of California, One Shields Avenue, Davis, CA 95616" } ], "familyNames": [ @@ -63,7 +63,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Plant Biology, University of California" + "name": "Department of Plant Biology, University of California, One Shields Avenue, Davis, CA 95616" }, { "type": "Organization", @@ -71,7 +71,7 @@ "type": "PostalAddress", "addressCountry": "South Africa" }, - "name": "Department of Plant and Soil Sciences, FABI, Innovation Africa, University of Pretoria" + "name": "Department of Plant and Soil Sciences, FABI, Innovation Africa, University of Pretoria, Lynwood Road, Hatfield 0002" } ], "familyNames": [ @@ -98,7 +98,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Plant Biology, University of California" + "name": "Department of Plant Biology, University of California, One Shields Avenue, Davis, CA 95616" } ], "emails": [ diff --git a/src/codecs/jats/__file_snapshots__/81445f02-6bf5-1014-892a-9f5909cc27c1.json b/src/codecs/jats/__file_snapshots__/81445f02-6bf5-1014-892a-9f5909cc27c1.json index 617a19c72..64f507d82 100644 --- a/src/codecs/jats/__file_snapshots__/81445f02-6bf5-1014-892a-9f5909cc27c1.json +++ b/src/codecs/jats/__file_snapshots__/81445f02-6bf5-1014-892a-9f5909cc27c1.json @@ -16,7 +16,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School" + "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School, Nanjing, 210008" } ], "familyNames": [ @@ -35,7 +35,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School" + "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School, Nanjing, 210008" } ], "familyNames": [ @@ -54,7 +54,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School" + "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School, Nanjing, 210008" } ], "familyNames": [ @@ -73,7 +73,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "Jiangsu Key Laboratory of Molecular Medicine, Medical School of Nanjing University" + "name": "Jiangsu Key Laboratory of Molecular Medicine, Medical School of Nanjing University, Nanjing, 210093" } ], "familyNames": [ @@ -92,7 +92,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "Jiangsu Key Laboratory of Molecular Medicine, Medical School of Nanjing University" + "name": "Jiangsu Key Laboratory of Molecular Medicine, Medical School of Nanjing University, Nanjing, 210093" } ], "familyNames": [ @@ -111,7 +111,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "Department of Nutrition, School of Public Health, School of Medicine, Zhejiang University" + "name": "Department of Nutrition, School of Public Health, School of Medicine, Zhejiang University, Hangzhou" } ], "familyNames": [ @@ -130,7 +130,7 @@ "type": "PostalAddress", "addressCountry": "Israel" }, - "name": "Faculty of Biotechnology and Food Engineering, Technion Israel Institute of Technology" + "name": "Faculty of Biotechnology and Food Engineering, Technion Israel Institute of Technology, Haifa" } ], "familyNames": [ @@ -149,7 +149,7 @@ "type": "PostalAddress", "addressCountry": "Mexico" }, - "name": "Department of Physiology, Biophysics and Neuroscience" + "name": "Department of Physiology, Biophysics and Neuroscience, Cinvestav, Mexico City" } ], "familyNames": [ @@ -175,7 +175,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School" + "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School, Nanjing, 210008" } ], "emails": [ @@ -197,7 +197,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School" + "name": "State Key Laboratory of Pharmaceutical Biotechnology, Department of Vascular Surgery, The Affiliated Drum Tower Hospital of Nanjing University Medical School, Nanjing, 210008" }, { "type": "Organization", @@ -205,7 +205,7 @@ "type": "PostalAddress", "addressCountry": "P. R. China" }, - "name": "Jiangsu Key Laboratory of Molecular Medicine, Medical School of Nanjing University" + "name": "Jiangsu Key Laboratory of Molecular Medicine, Medical School of Nanjing University, Nanjing, 210093" } ], "emails": [ diff --git a/src/codecs/jats/__file_snapshots__/8758d58a-6c3d-1014-87a3-bbc202f7d832.json b/src/codecs/jats/__file_snapshots__/8758d58a-6c3d-1014-87a3-bbc202f7d832.json index 04833d7fd..a7e255715 100644 --- a/src/codecs/jats/__file_snapshots__/8758d58a-6c3d-1014-87a3-bbc202f7d832.json +++ b/src/codecs/jats/__file_snapshots__/8758d58a-6c3d-1014-87a3-bbc202f7d832.json @@ -16,7 +16,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" }, { "type": "Organization", @@ -24,7 +24,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD)" + "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD), Paris" } ], "familyNames": [ @@ -43,7 +43,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" }, { "type": "Organization", @@ -51,7 +51,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD)" + "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD), Paris" } ], "familyNames": [ @@ -70,7 +70,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" } ], "familyNames": [ @@ -89,7 +89,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" } ], "familyNames": [ @@ -108,7 +108,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" }, { "type": "Organization", @@ -116,7 +116,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD)" + "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD), Paris" } ], "familyNames": [ @@ -135,7 +135,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Université de Paris, Institut Cochin" + "name": "Université de Paris, Institut Cochin, CNRS, INSERM, Paris" } ], "familyNames": [ @@ -154,7 +154,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD)" + "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD), Paris" } ], "familyNames": [ @@ -173,7 +173,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD)" + "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD), Paris" } ], "familyNames": [ @@ -192,7 +192,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD)" + "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD), Paris" } ], "familyNames": [ @@ -211,7 +211,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "ILTOO pharma, Statistical department" + "name": "ILTOO pharma, Statistical department, Paris" } ], "familyNames": [ @@ -230,7 +230,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "CRCINA, INSERM, CNRS, Université d’Angers, Université de Nantes" + "name": "CRCINA, INSERM, CNRS, Université d’Angers, Université de Nantes, Nantes" } ], "familyNames": [ @@ -249,7 +249,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "CRCINA, INSERM, CNRS, Université d’Angers, Université de Nantes" + "name": "CRCINA, INSERM, CNRS, Université d’Angers, Université de Nantes, Nantes" } ], "familyNames": [ @@ -264,7 +264,7 @@ "affiliations": [ { "type": "Organization", - "name": "Center of Life Sciences" + "name": "Center of Life Sciences, Skoltech, Moscow, Russia" } ], "familyNames": [ @@ -290,7 +290,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" } ], "familyNames": [ @@ -316,7 +316,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Université de Paris, Institut Cochin" + "name": "Université de Paris, Institut Cochin, CNRS, INSERM, Paris" } ], "familyNames": [ @@ -335,7 +335,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Université de Paris, Institut Cochin" + "name": "Université de Paris, Institut Cochin, CNRS, INSERM, Paris" }, { "type": "Organization", @@ -343,7 +343,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Assistance Publique Hôpitaux de Paris, Service de Diabétologie et Immunologie Clinique, Cochin Hospital" + "name": "Assistance Publique Hôpitaux de Paris, Service de Diabétologie et Immunologie Clinique, Cochin Hospital, Paris" } ], "familyNames": [ @@ -362,7 +362,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" } ], "familyNames": [ @@ -381,7 +381,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3)" + "name": "Sorbonne Université, INSERM, Immunology-Immunopathology-Immunotherapy (i3), Paris" }, { "type": "Organization", @@ -389,7 +389,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD)" + "name": "AP-HP, Hôpital Pitié-Salpêtrière, Clinical Investigation Center for Biotherapies (CIC-BTi) and Immunology-Inflammation-Infectiology and Dermatology Department (3iD), Paris" } ], "emails": [ diff --git a/src/codecs/jats/__file_snapshots__/c2c3813f-6c98-1014-8ba7-9ee2cd5f4386.json b/src/codecs/jats/__file_snapshots__/c2c3813f-6c98-1014-8ba7-9ee2cd5f4386.json index 548ccbc0f..8bff13240 100644 --- a/src/codecs/jats/__file_snapshots__/c2c3813f-6c98-1014-8ba7-9ee2cd5f4386.json +++ b/src/codecs/jats/__file_snapshots__/c2c3813f-6c98-1014-8ba7-9ee2cd5f4386.json @@ -16,7 +16,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Physiology and Membrane Biology, University of California Davis" + "name": "Department of Physiology and Membrane Biology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -36,7 +36,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Pharmacology, University of California Davis" + "name": "Department of Pharmacology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -56,7 +56,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Entomology and Nematology & Comprehensive Cancer Center, University of California Davis" + "name": "Department of Entomology and Nematology & Comprehensive Cancer Center, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -76,7 +76,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Physiology and Membrane Biology, University of California Davis" + "name": "Department of Physiology and Membrane Biology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -96,7 +96,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Pharmacology, University of California Davis" + "name": "Department of Pharmacology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -115,7 +115,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Physiology and Membrane Biology, University of California Davis" + "name": "Department of Physiology and Membrane Biology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -134,7 +134,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Pharmacology, University of California Davis" + "name": "Department of Pharmacology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -153,7 +153,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Physiology and Membrane Biology, University of California Davis" + "name": "Department of Physiology and Membrane Biology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -173,7 +173,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "AnaBios Corporation" + "name": "AnaBios Corporation, San Diego, CA 92109" } ], "familyNames": [ @@ -193,7 +193,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "AnaBios Corporation" + "name": "AnaBios Corporation, San Diego, CA 92109" } ], "familyNames": [ @@ -212,7 +212,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "AnaBios Corporation" + "name": "AnaBios Corporation, San Diego, CA 92109" } ], "familyNames": [ @@ -231,7 +231,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Ambiopharm Inc." + "name": "Ambiopharm Inc., North Augusta, GA 29842" } ], "familyNames": [ @@ -258,7 +258,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Entomology and Nematology & Comprehensive Cancer Center, University of California Davis" + "name": "Department of Entomology and Nematology & Comprehensive Cancer Center, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -284,7 +284,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Physiology and Membrane Biology, University of California Davis" + "name": "Department of Physiology and Membrane Biology, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -311,7 +311,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Physiology and Membrane Biology, University of California Davis" + "name": "Department of Physiology and Membrane Biology, University of California Davis, Davis, CA 95616" }, { "type": "Organization", @@ -319,7 +319,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Anesthesiology and Pain Medicine, University of California Davis" + "name": "Department of Anesthesiology and Pain Medicine, University of California Davis, Davis, CA 95616" } ], "familyNames": [ @@ -346,7 +346,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Pharmacology, University of California Davis" + "name": "Department of Pharmacology, University of California Davis, Davis, CA 95616" } ], "emails": [ @@ -368,7 +368,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Physiology and Membrane Biology, University of California Davis" + "name": "Department of Physiology and Membrane Biology, University of California Davis, Davis, CA 95616" }, { "type": "Organization", @@ -376,7 +376,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Department of Anesthesiology and Pain Medicine, University of California Davis" + "name": "Department of Anesthesiology and Pain Medicine, University of California Davis, Davis, CA 95616" }, { "type": "Organization", @@ -384,7 +384,7 @@ "type": "PostalAddress", "addressCountry": "USA" }, - "name": "Biophysics Graduate Group, University of California Davis" + "name": "Biophysics Graduate Group, University of California Davis, Davis, CA 95616" } ], "emails": [ diff --git a/src/codecs/jats/__file_snapshots__/ca7917ff-6cb0-1014-9b19-d05ef1e56b05.json b/src/codecs/jats/__file_snapshots__/ca7917ff-6cb0-1014-9b19-d05ef1e56b05.json index 31d15b257..ae0b76811 100644 --- a/src/codecs/jats/__file_snapshots__/ca7917ff-6cb0-1014-9b19-d05ef1e56b05.json +++ b/src/codecs/jats/__file_snapshots__/ca7917ff-6cb0-1014-9b19-d05ef1e56b05.json @@ -16,7 +16,7 @@ "type": "PostalAddress", "addressCountry": "Canada" }, - "name": "Department of Zoology and Life Sciences Institute, University of British Columbia" + "name": "Department of Zoology and Life Sciences Institute, University of British Columbia, Vancouver" } ], "familyNames": [ @@ -35,7 +35,7 @@ "type": "PostalAddress", "addressCountry": "Canada" }, - "name": "Department of Zoology and Life Sciences Institute, University of British Columbia" + "name": "Department of Zoology and Life Sciences Institute, University of British Columbia, Vancouver" } ], "familyNames": [ @@ -61,7 +61,7 @@ "type": "PostalAddress", "addressCountry": "Canada" }, - "name": "Department of Zoology and Life Sciences Institute, University of British Columbia" + "name": "Department of Zoology and Life Sciences Institute, University of British Columbia, Vancouver" } ], "familyNames": [ @@ -87,7 +87,7 @@ "type": "PostalAddress", "addressCountry": "Canada" }, - "name": "Department of Zoology and Life Sciences Institute, University of British Columbia" + "name": "Department of Zoology and Life Sciences Institute, University of British Columbia, Vancouver" } ], "emails": [ diff --git a/src/codecs/jats/__file_snapshots__/d6f14042-6db3-1014-b228-f9da7cb8e4cc.json b/src/codecs/jats/__file_snapshots__/d6f14042-6db3-1014-b228-f9da7cb8e4cc.json index b61247503..17dc42f95 100644 --- a/src/codecs/jats/__file_snapshots__/d6f14042-6db3-1014-b228-f9da7cb8e4cc.json +++ b/src/codecs/jats/__file_snapshots__/d6f14042-6db3-1014-b228-f9da7cb8e4cc.json @@ -29,7 +29,7 @@ "type": "PostalAddress", "addressCountry": "Finland" }, - "name": "Methodology Center for Human Sciences, University of Jyväskylä" + "name": "Methodology Center for Human Sciences, University of Jyväskylä, Jyväskylä" } ], "familyNames": [ @@ -55,7 +55,7 @@ "type": "PostalAddress", "addressCountry": "Finland" }, - "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki" + "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki, Helsinki" } ], "familyNames": [ @@ -81,7 +81,7 @@ "type": "PostalAddress", "addressCountry": "Finland" }, - "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki" + "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki, Helsinki" } ], "familyNames": [ @@ -107,7 +107,7 @@ "type": "PostalAddress", "addressCountry": "Finland" }, - "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki" + "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki, Helsinki" } ], "familyNames": [ @@ -133,7 +133,7 @@ "type": "PostalAddress", "addressCountry": "Finland" }, - "name": "Gerontology Research Center (GEREC), Faculty of Sport and Health Sciences, University of Jyväskylä" + "name": "Gerontology Research Center (GEREC), Faculty of Sport and Health Sciences, University of Jyväskylä, Jyväskylä" }, { "type": "Organization", @@ -141,7 +141,7 @@ "type": "PostalAddress", "addressCountry": "Finland" }, - "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki" + "name": "Institute for Molecular Medicine Finland (FIMM), HiLife, University of Helsinki, Helsinki" } ], "familyNames": [ diff --git a/src/codecs/jats/__file_snapshots__/e9291f49-6d06-1014-9500-e156797df82e.json b/src/codecs/jats/__file_snapshots__/e9291f49-6d06-1014-9500-e156797df82e.json index 10636cfbf..2207beadb 100644 --- a/src/codecs/jats/__file_snapshots__/e9291f49-6d06-1014-9500-e156797df82e.json +++ b/src/codecs/jats/__file_snapshots__/e9291f49-6d06-1014-9500-e156797df82e.json @@ -16,7 +16,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering" + "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering, Ecole Polytechnique Fédérale de Lausanne, Lausanne" } ], "familyNames": [ @@ -35,7 +35,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Laboratory of Integrative Systems Physiology, Institute of Bioengineering" + "name": "Laboratory of Integrative Systems Physiology, Institute of Bioengineering, Ecole Polytechnique Fédérale de Lausanne, Lausanne" } ], "familyNames": [ @@ -55,7 +55,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering" + "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering, Ecole Polytechnique Fédérale de Lausanne, Lausanne" } ], "familyNames": [ @@ -74,7 +74,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering" + "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering, Ecole Polytechnique Fédérale de Lausanne, Lausanne" } ], "familyNames": [ @@ -93,7 +93,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Center for Integrative Genomics, Université de Lausanne" + "name": "Center for Integrative Genomics, Université de Lausanne, Lausanne" }, { "type": "Organization", @@ -101,7 +101,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "Institute of Metabolic and Cardiovascular Diseases (I2MC), UMR1297, INSERM, University of Toulouse" + "name": "Institute of Metabolic and Cardiovascular Diseases (I2MC), UMR1297, INSERM, University of Toulouse, Toulouse" } ], "familyNames": [ @@ -127,7 +127,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Center for Integrative Genomics, Université de Lausanne" + "name": "Center for Integrative Genomics, Université de Lausanne, Lausanne" } ], "familyNames": [ @@ -146,7 +146,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Center for Integrative Genomics, Université de Lausanne" + "name": "Center for Integrative Genomics, Université de Lausanne, Lausanne" }, { "type": "Organization", @@ -154,7 +154,7 @@ "type": "PostalAddress", "addressCountry": "France" }, - "name": "INSERM, Occitanie" + "name": "INSERM, Occitanie, Montpellier" } ], "familyNames": [ @@ -180,7 +180,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Laboratory of Integrative Systems Physiology, Institute of Bioengineering" + "name": "Laboratory of Integrative Systems Physiology, Institute of Bioengineering, Ecole Polytechnique Fédérale de Lausanne, Lausanne" } ], "familyNames": [ @@ -199,7 +199,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering" + "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering, Ecole Polytechnique Fédérale de Lausanne, Lausanne" }, { "type": "Organization", @@ -207,7 +207,7 @@ "type": "PostalAddress", "addressCountry": "Italy" }, - "name": "Department of Life Sciences, University of Trieste" + "name": "Department of Life Sciences, University of Trieste, Trieste" } ], "familyNames": [ @@ -226,7 +226,7 @@ "type": "PostalAddress", "addressCountry": "Switzerland" }, - "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering" + "name": "Laboratory of Metabolic Signaling, Institute of Bioengineering, Ecole Polytechnique Fédérale de Lausanne, Lausanne" } ], "emails": [ diff --git a/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.jats.xml b/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.jats.xml index 01159c12c..11a4329f6 100644 --- a/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.jats.xml +++ b/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.jats.xml @@ -141,61 +141,61 @@ - + National Center for Biotechnology Information, National Library of Medicine, National Institutes of Health, Bethesda, MD, 20894, USA - + National Center for Biotechnology Information, National Library of Medicine, National Institutes of Health, Bethesda, MD, 20894, USA - + eLife Sciences Publications, Ltd, Cambridge, UK - + European Bioinformatics Institute (EMBL-EBI), Wellcome Trust Genome Campus, Hinxton, Cambridge, UK - + BMJ, London, UK - + eLife Sciences Publications, Ltd, Cambridge, UK - + SpringerNature, London, UK - + F1000, London, UK - + SpringerNature, London, UK - + European Bioinformatics Institute (EMBL-EBI), Wellcome Trust Genome Campus, Hinxton, Cambridge, UK - + The Royal Society, London, UK - + EMBO, Heidelberg, Germany - + Crossref, Oxford, UK - + PLOS, Cambridge, UK - + European Bioinformatics Institute (EMBL-EBI), Wellcome Trust Genome Campus, Hinxton, Cambridge, UK - + BMJ, London, UK - + eLife Sciences Publications, Ltd, Cambridge, UK - + SpringerNature, London, UK - + PeerJ, London, UK diff --git a/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.yaml b/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.yaml index 6413a42be..34b40d7e0 100644 --- a/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.yaml +++ b/src/codecs/jats/__file_snapshots__/f1000-7-1655-v1.yaml @@ -6,6 +6,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + National Center for Biotechnology Information, National Library of + Medicine, National Institutes of Health, Bethesda, MD, 20894, USA emails: - beck@ncbi.nlm.nih.gov familyNames: @@ -15,6 +18,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + National Center for Biotechnology Information, National Library of + Medicine, National Institutes of Health, Bethesda, MD, 20894, USA emails: - kathryn.funk@nih.gov familyNames: @@ -24,6 +30,7 @@ authors: - type: Person affiliations: - type: Organization + name: eLife Sciences Publications, Ltd, Cambridge, UK emails: - m.harrison@elifesciences.org familyNames: @@ -33,6 +40,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + European Bioinformatics Institute (EMBL-EBI), Wellcome Trust Genome + Campus, Hinxton, Cambridge, UK emails: - mcentyre@ebi.ac.uk familyNames: @@ -42,6 +52,7 @@ authors: - type: Person affiliations: - type: Organization + name: BMJ, London, UK familyNames: - Breen givenNames: @@ -49,6 +60,7 @@ authors: - type: Person affiliations: - type: Organization + name: eLife Sciences Publications, Ltd, Cambridge, UK familyNames: - Collings givenNames: @@ -56,6 +68,7 @@ authors: - type: Person affiliations: - type: Organization + name: SpringerNature, London, UK familyNames: - Donohoe givenNames: @@ -63,6 +76,7 @@ authors: - type: Person affiliations: - type: Organization + name: F1000, London, UK familyNames: - Evans givenNames: @@ -70,6 +84,7 @@ authors: - type: Person affiliations: - type: Organization + name: SpringerNature, London, UK familyNames: - Flintoft givenNames: @@ -77,6 +92,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + European Bioinformatics Institute (EMBL-EBI), Wellcome Trust Genome + Campus, Hinxton, Cambridge, UK familyNames: - Hamelers givenNames: @@ -84,6 +102,7 @@ authors: - type: Person affiliations: - type: Organization + name: The Royal Society, London, UK familyNames: - Hurst givenNames: @@ -91,6 +110,7 @@ authors: - type: Person affiliations: - type: Organization + name: EMBO, Heidelberg, Germany familyNames: - Lemberger givenNames: @@ -98,6 +118,7 @@ authors: - type: Person affiliations: - type: Organization + name: Crossref, Oxford, UK familyNames: - Lin givenNames: @@ -105,6 +126,7 @@ authors: - type: Person affiliations: - type: Organization + name: PLOS, Cambridge, UK familyNames: - O'Connor givenNames: @@ -112,6 +134,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + European Bioinformatics Institute (EMBL-EBI), Wellcome Trust Genome + Campus, Hinxton, Cambridge, UK familyNames: - Parkin givenNames: @@ -119,6 +144,7 @@ authors: - type: Person affiliations: - type: Organization + name: BMJ, London, UK familyNames: - Parker givenNames: @@ -126,6 +152,7 @@ authors: - type: Person affiliations: - type: Organization + name: eLife Sciences Publications, Ltd, Cambridge, UK familyNames: - Rodgers givenNames: @@ -133,6 +160,7 @@ authors: - type: Person affiliations: - type: Organization + name: SpringerNature, London, UK familyNames: - Skipper givenNames: @@ -140,6 +168,7 @@ authors: - type: Person affiliations: - type: Organization + name: PeerJ, London, UK familyNames: - Stoner givenNames: diff --git a/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.jats.xml b/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.jats.xml index 16d2ad42e..7c3c08cd5 100644 --- a/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.jats.xml +++ b/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.jats.xml @@ -71,31 +71,31 @@ - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany - + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, 76189, Germany diff --git a/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.yaml b/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.yaml index 04ae15117..39248678b 100644 --- a/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.yaml +++ b/src/codecs/jats/__file_snapshots__/f1000-8-1394-v1.yaml @@ -6,6 +6,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany emails: - lachenmeier@web.de familyNames: @@ -16,6 +19,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Habel givenNames: @@ -23,6 +29,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Fischer givenNames: @@ -30,6 +39,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Herbi givenNames: @@ -37,6 +49,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Zerbe givenNames: @@ -44,6 +59,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Bock givenNames: @@ -51,6 +69,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Rajcic - de @@ -60,6 +81,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Walch givenNames: @@ -68,6 +92,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Chemisches und Veterinäruntersuchungsamt (CVUA) Karlsruhe, Karlsruhe, + 76189, Germany familyNames: - Sproll givenNames: diff --git a/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.jats.xml b/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.jats.xml index 8688f181f..a61fd534a 100644 --- a/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.jats.xml +++ b/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.jats.xml @@ -64,28 +64,28 @@ - + Department of Biology, United Arab Emirates University, Al Ain, Abu Dhabi, United Arab Emirates - + Centre for Climate Change and Adaptation Research, Anna University, Chennai, India - + Department of Biology, United Arab Emirates University, Al Ain, Abu Dhabi, United Arab Emirates - + Department of Biology, United Arab Emirates University, Al Ain, Abu Dhabi, United Arab Emirates - + Department of Biology, United Arab Emirates University, Al Ain, Abu Dhabi, United Arab Emirates - + Department of Biology, United Arab Emirates University, Al Ain, Abu Dhabi, United Arab Emirates - + Department of Biology, United Arab Emirates University, Al Ain, Abu Dhabi, United Arab Emirates - + Department of Biology, United Arab Emirates University, Al Ain, Abu Dhabi, United Arab Emirates diff --git a/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.yaml b/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.yaml index 2256c460d..597ec9509 100644 --- a/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.yaml +++ b/src/codecs/jats/__file_snapshots__/f1000-8-978-v1.yaml @@ -6,6 +6,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Department of Biology, United Arab Emirates University, Al Ain, Abu + Dhabi, United Arab Emirates emails: - tksiksi@uaeu.ac.ae familyNames: @@ -16,6 +19,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Centre for Climate Change and Adaptation Research, Anna University, + Chennai, India familyNames: - K. givenNames: @@ -23,6 +29,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Department of Biology, United Arab Emirates University, Al Ain, Abu + Dhabi, United Arab Emirates familyNames: - Mousa givenNames: @@ -31,6 +40,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Department of Biology, United Arab Emirates University, Al Ain, Abu + Dhabi, United Arab Emirates familyNames: - Al-Badi givenNames: @@ -39,6 +51,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Department of Biology, United Arab Emirates University, Al Ain, Abu + Dhabi, United Arab Emirates familyNames: - Al - Kaabi @@ -48,6 +63,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Department of Biology, United Arab Emirates University, Al Ain, Abu + Dhabi, United Arab Emirates familyNames: - Alameemi givenNames: @@ -56,6 +74,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Department of Biology, United Arab Emirates University, Al Ain, Abu + Dhabi, United Arab Emirates familyNames: - Fereaa givenNames: @@ -64,6 +85,9 @@ authors: - type: Person affiliations: - type: Organization + name: >- + Department of Biology, United Arab Emirates University, Al Ain, Abu + Dhabi, United Arab Emirates familyNames: - Hassan givenNames: diff --git a/src/codecs/jats/index.ts b/src/codecs/jats/index.ts index 72bbf0efa..f0d3413c9 100644 --- a/src/codecs/jats/index.ts +++ b/src/codecs/jats/index.ts @@ -1067,10 +1067,12 @@ export function decodeAff(aff: xml.Element): stencila.Organization { const url = textOrUndefined(child(aff, 'uri')) // Get any extra, non-wrapped, text - const extraText = aff.elements - ?.filter((elem) => elem.type === 'text') - .map((elem) => elem.text) - .join() ?? '' + const extraText = + aff.elements + ?.filter((elem) => elem.type === 'text') + .map((elem) => elem.text) + .join() + .trim() ?? '' let name = textOrUndefined(institutions[0] ?? null) if (name === undefined && addressComponents.length > 0) { @@ -1081,7 +1083,7 @@ export function decodeAff(aff: xml.Element): stencila.Organization { // Add the extra text, removing any spaces and trailing commas (e.g. those // that separate the text from the address elements) - name += extraText.trim() + name = name ? name + extraText : extraText if (name?.endsWith(',')) { name = name.slice(0, -1) } diff --git a/src/codecs/jats/jats.test.ts b/src/codecs/jats/jats.test.ts index 24f924cc3..f4370a6bf 100644 --- a/src/codecs/jats/jats.test.ts +++ b/src/codecs/jats/jats.test.ts @@ -77,7 +77,7 @@ describe('encode: Math', () => { }) }) -test.only('decode: affiliation retains content not in or address elements', () => { +test('decode: affiliation retains content not in or address elements', () => { const aff = xml.load(`