From: Jim Procter Date: Fri, 7 Oct 2022 14:19:54 +0000 (+0100) Subject: Merge branch 'develop' into releases/Release_2_11_2_Branch X-Git-Tag: Release_2_11_2_5~6 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=53c0221021c8328cac903a3f8dce7a806cbc4095;hp=a6eb3a3acc83c1670700dd2da39a815dfecab7e3 Merge branch 'develop' into releases/Release_2_11_2_Branch --- diff --git a/src/jalview/ws/dbsources/Pfam.java b/src/jalview/ws/dbsources/Pfam.java index 93001a4..26c907c 100644 --- a/src/jalview/ws/dbsources/Pfam.java +++ b/src/jalview/ws/dbsources/Pfam.java @@ -39,7 +39,7 @@ import jalview.util.Platform; abstract public class Pfam extends Xfam { public static final String FULL = "full", RP35 = "rp35", RP15 = "rp15", - RP75 = "rp75", RP55 = "rp55", SEED = "seed"; + RP75 = "rp75", RP55 = "rp55", SEED = "seed", UNIPROT = "uniprot"; public String getPfamDownloadURL(String id, String alType) { @@ -53,7 +53,10 @@ abstract public class Pfam extends Xfam protected String alignmentType; - private static final String DEFAULT_PFAM_BASEURL = "https://www.ebi.ac.uk/interpro/wwwapi/entry/pfam/$PFAMID$/?annotation=alignment:$ALTYPE$&download"; + /** + * docs are http://www.ebi.ac.uk/interpro/api/ + */ + private static final String DEFAULT_PFAM_BASEURL = "www.ebi.ac.uk/interpro/api/entry/pfam/$PFAMID$/?annotation=alignment:$ALTYPE"; static {