X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FXfam.java;h=36d98915a11341da8e5059603d6cc78b0c55fb5d;hb=6ca8a32d88328b8f2162512f41c657c87e131045;hp=b0bea88c21171b42b8c30d81add4b5dadac56b12;hpb=87b75c983d6140e6673aed55f333563f2fd86817;p=jalview.git

diff --git a/src/jalview/ws/dbsources/Xfam.java b/src/jalview/ws/dbsources/Xfam.java
index b0bea88..36d9891 100644
--- a/src/jalview/ws/dbsources/Xfam.java
+++ b/src/jalview/ws/dbsources/Xfam.java
@@ -20,7 +20,9 @@
  */
 package jalview.ws.dbsources;
 
-import jalview.bin.Cache;
+import java.util.Locale;
+
+import jalview.bin.Console;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.DBRefEntry;
 import jalview.io.DataSourceType;
@@ -36,13 +38,17 @@ import jalview.ws.seqfetcher.DbSourceProxyImpl;
  */
 public abstract class Xfam extends DbSourceProxyImpl
 {
-
   public Xfam()
   {
     super();
   }
 
-  protected abstract String getXFAMURL();
+  /**
+   * the base URL for this Xfam-like service
+   * 
+   * @return
+   */
+  protected abstract String getURLPrefix();
 
   @Override
   public abstract String getDbVersion();
@@ -57,33 +63,34 @@ public abstract class Xfam extends DbSourceProxyImpl
     // retrieved.
     startQuery();
     // TODO: trap HTTP 404 exceptions and return null
-    String xfamUrl = getXFAMURL()
-            + queries.trim().toUpperCase() + getXFAMURLSUFFIX();
+    String xfamUrl = getURL(queries);
 
-    if (Cache.log != null)
-    {
-      Cache.log.debug("XFAM URL for retrieval is: " + xfamUrl);
-    }
+    Console.debug("XFAM URL for retrieval is: " + xfamUrl);
 
-    AlignmentI rcds = new FormatAdapter().readFile(xfamUrl  ,
+    AlignmentI rcds = new FormatAdapter().readFile(xfamUrl,
             DataSourceType.URL, FileFormat.Stockholm);
 
     for (int s = 0, sNum = rcds.getHeight(); s < sNum; s++)
     {
       rcds.getSequenceAt(s).addDBRef(new DBRefEntry(getXfamSource(),
-      // getDbSource(),
-              getDbVersion(), queries.trim().toUpperCase()));
+              // getDbSource(),
+              getDbVersion(), queries.trim().toUpperCase(Locale.ROOT)));
       if (!getDbSource().equals(getXfamSource()))
       { // add the specific ref too
-        rcds.getSequenceAt(s).addDBRef(
-                new DBRefEntry(getDbSource(), getDbVersion(), queries
-                        .trim().toUpperCase()));
+        rcds.getSequenceAt(s).addDBRef(new DBRefEntry(getDbSource(),
+                getDbVersion(), queries.trim().toUpperCase(Locale.ROOT)));
       }
     }
     stopQuery();
     return rcds;
   }
 
+  String getURL(String queries)
+  {
+    return getURLPrefix() + "/family/"
+            + queries.trim().toUpperCase(Locale.ROOT) + getURLSuffix();
+  }
+
   /**
    * Pfam and Rfam provide alignments
    */
@@ -98,7 +105,7 @@ public abstract class Xfam extends DbSourceProxyImpl
    * 
    * @return "" for most Xfam sources
    */
-  public String getXFAMURLSUFFIX()
+  public String getURLSuffix()
   {
     return "";
   }