X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fdbsources%2FPfam.java;h=316c1aac7d3e7711ddd38598a87fc1343838d09d;hb=a5d05d981da8510d2fc2e02aec0b110d6f5dc47e;hp=456236a02efd63d3b5954230320e0aa5f646ab77;hpb=1724567f3dfc3b4637aac7bdeb6633628e6a8335;p=jalview.git

diff --git a/src/jalview/ws/dbsources/Pfam.java b/src/jalview/ws/dbsources/Pfam.java
index 456236a..316c1aa 100644
--- a/src/jalview/ws/dbsources/Pfam.java
+++ b/src/jalview/ws/dbsources/Pfam.java
@@ -20,12 +20,14 @@
  */
 package jalview.ws.dbsources;
 
+import java.util.Locale;
+
+import com.stevesoft.pat.Regex;
+
 import jalview.bin.Cache;
 import jalview.datamodel.DBRefSource;
 import jalview.util.Platform;
 
-import com.stevesoft.pat.Regex;
-
 /**
  * TODO: later PFAM is a complex datasource - it could return a tree in addition
  * to an alignment TODO: create interface to pass alignment properties and tree
@@ -36,15 +38,28 @@ import com.stevesoft.pat.Regex;
  */
 abstract public class Pfam extends Xfam
 {
-  /*
-   * append to URLs to retrieve as a gzipped file
-   */
-  protected static final String GZIPPED = "/gzipped";
+  public static final String FULL = "full", RP35 = "rp35", RP15 = "rp15",
+          RP75 = "rp75", RP55 = "rp55", SEED = "seed", UNIPROT = "uniprot";
+
+  public String getPfamDownloadURL(String id, String alType)
+  {
+    String url = Cache.getDefault(PFAM_BASEURL_KEY, DEFAULT_PFAM_BASEURL);
+    url = url.replace("$PFAMID$", id);
+    url = url.replace("$ALTYPE$", alType);
+    return url;
+  }
 
-  static final String PFAM_BASEURL_KEY = "PFAM_BASEURL";
+  static final String PFAM_BASEURL_KEY = "PFAM_INTERPRO_URL_TEMPLATE";
 
-  private static final String DEFAULT_PFAM_BASEURL = "https://pfam.xfam.org";
-  static {
+  protected String alignmentType;
+
+  /**
+   * docs are http://www.ebi.ac.uk/interpro/api/
+   */
+  private static final String DEFAULT_PFAM_BASEURL = "https://www.ebi.ac.uk/interpro/api/entry/pfam/$PFAMID$/?annotation=alignment:$ALTYPE$";
+
+  static
+  {
     Platform.addJ2SDirectDatabaseCall(DEFAULT_PFAM_BASEURL);
   }
 
@@ -53,6 +68,13 @@ abstract public class Pfam extends Xfam
     super();
   }
 
+  @Override
+  String getURL(String queries)
+  {
+    return getPfamDownloadURL(queries.trim().toUpperCase(Locale.ROOT),
+            alignmentType);
+  }
+
   /*
    * (non-Javadoc)
    * 
@@ -131,5 +153,4 @@ abstract public class Pfam extends Xfam
   {
     return DBRefSource.PFAM;
   }
-
 }