JAL-4073 Pfam retrieval now works via a template including $PFAMID$ and $ALTYPE$...

[jalview.git] / src / jalview / ws / dbsources / Pfam.java

diff --git a/src/jalview/ws/dbsources/Pfam.java b/src/jalview/ws/dbsources/Pfam.java
index d07bd14..0c21d42 100644 (file)
--- a/src/jalview/ws/dbsources/Pfam.java
+++ b/src/jalview/ws/dbsources/Pfam.java
@@ -20,8 +20,11 @@
  */
 package jalview.ws.dbsources;
 
+import java.util.Locale;
+
 import jalview.bin.Cache;
 import jalview.datamodel.DBRefSource;
+import jalview.util.Platform;
 
 import com.stevesoft.pat.Regex;
 
@@ -35,15 +38,36 @@ import com.stevesoft.pat.Regex;
  */
 abstract public class Pfam extends Xfam
 {
-  private static final String PFAM_BASEURL_KEY = "PFAM_BASEURL";
+    public static final String FULL="full",RP35="rp35",RP15="rp15",RP75="rp75",RP55="rp55",SEED="seed";
+       
+   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_INTERPRO_URL_TEMPLATE";
+
+  protected String alignmentType;
+  private static final String DEFAULT_PFAM_BASEURL = "https://www.ebi.ac.uk/interpro/wwwapi/entry/pfam/$PFAMID$/?annotation=alignment:$ALTYPE$&download";
 
-  private static final String DEFAULT_PFAM_BASEURL = "http://pfam.xfam.org";
+  static
+  {
+    Platform.addJ2SDirectDatabaseCall(DEFAULT_PFAM_BASEURL);
+  }
 
   public Pfam()
   {
     super();
   }
 
+    
+    String getURL(String queries)
+  {
+      return getPfamDownloadURL(
+                                queries.trim().toUpperCase(Locale.ROOT), alignmentType);
+  }
+
   /*
    * (non-Javadoc)
    * 
@@ -122,5 +146,4 @@ abstract public class Pfam extends Xfam
   {
     return DBRefSource.PFAM;
   }
-
 }