X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FDBRefFetcher.java;h=581901a5450a2f9655ea2bf278ab694c988f27db;hb=f5a2fd32ad34d909ba7326ab40c1709cf00bdf32;hp=4b7c07e6d1b0dcd72ab01909a98a0c732fdd0a39;hpb=37c97b109c3a03f4640bce3855069f8ad8e17123;p=jalview.git

diff --git a/src/jalview/ws/DBRefFetcher.java b/src/jalview/ws/DBRefFetcher.java
index 4b7c07e..581901a 100644
--- a/src/jalview/ws/DBRefFetcher.java
+++ b/src/jalview/ws/DBRefFetcher.java
@@ -19,6 +19,7 @@
 package jalview.ws;
 
 import jalview.analysis.AlignSeq;
+import jalview.bin.Cache;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.DBRefSource;
@@ -59,6 +60,7 @@ public class DBRefFetcher implements Runnable
   StringBuffer sbuffer = new StringBuffer();
 
   boolean running = false;
+
   /**
    * picr client instance
    */
@@ -72,39 +74,45 @@ public class DBRefFetcher implements Runnable
 
   SequenceFetcher sfetcher;
 
+  private SequenceI[] alseqs;
+
   public DBRefFetcher()
   {
   }
 
   /**
-   * Creates a new SequenceFeatureFetcher object and fetches from the
-   * currently selected set of databases.
+   * Creates a new SequenceFeatureFetcher object and fetches from the currently
+   * selected set of databases.
    * 
    * @param seqs
-   *                fetch references for these sequences
+   *          fetch references for these sequences
    * @param af
-   *                the parent alignframe for progress bar monitoring.
+   *          the parent alignframe for progress bar monitoring.
    */
   public DBRefFetcher(SequenceI[] seqs, AlignFrame af)
   {
     this(seqs, af, null);
   }
+
   /**
-   * Creates a new SequenceFeatureFetcher object and fetches from the
-   * currently selected set of databases.
+   * Creates a new SequenceFeatureFetcher object and fetches from the currently
+   * selected set of databases.
    * 
    * @param seqs
-   *                fetch references for these sequences
+   *          fetch references for these sequences
    * @param af
-   *                the parent alignframe for progress bar monitoring.
-   * @param sources array of database source strings to query references from
+   *          the parent alignframe for progress bar monitoring.
+   * @param sources
+   *          array of database source strings to query references from
    */
   public DBRefFetcher(SequenceI[] seqs, AlignFrame af, String[] sources)
   {
     this.af = af;
+    alseqs = new SequenceI[seqs.length];
     SequenceI[] ds = new SequenceI[seqs.length];
     for (int i = 0; i < seqs.length; i++)
     {
+      alseqs[i] = seqs[i];
       if (seqs[i].getDatasetSequence() != null)
         ds[i] = seqs[i].getDatasetSequence();
       else
@@ -113,11 +121,13 @@ public class DBRefFetcher implements Runnable
     this.dataset = ds;
     // TODO Jalview 2.5 lots of this code should be in the gui package!
     sfetcher = jalview.gui.SequenceFetcher.getSequenceFetcherSingleton(af);
-    if (sources==null)
+    if (sources == null)
     {
       // af.featureSettings_actionPerformed(null);
-      String[] defdb=null,otherdb = sfetcher.getDbInstances(jalview.ws.dbsources.DasSequenceSource.class);
-      Vector selsources = new Vector(), dasselsrc= (af.featureSettings!=null) ? af.featureSettings.getSelectedSources()
+      String[] defdb = null, otherdb = sfetcher
+              .getDbInstances(jalview.ws.dbsources.DasSequenceSource.class);
+      Vector selsources = new Vector(), dasselsrc = (af.featureSettings != null) ? af.featureSettings
+              .getSelectedSources()
               : new jalview.gui.DasSourceBrowser().getSelectedSources();
       Enumeration en = dasselsrc.elements();
       while (en.hasMoreElements())
@@ -126,12 +136,14 @@ public class DBRefFetcher implements Runnable
         selsources.addElement(src.getNickname());
       }
       int osel = 0;
-      for (int o=0;otherdb!=null && o<otherdb.length;o++)
+      for (int o = 0; otherdb != null && o < otherdb.length; o++)
       {
         if (!selsources.contains(otherdb[o]))
         {
           otherdb[o] = null;
-        } else {
+        }
+        else
+        {
           osel++;
         }
       }
@@ -144,45 +156,56 @@ public class DBRefFetcher implements Runnable
       {
         defdb = DBRefSource.PROTEINDBS;
       }
-      // append the selected sequence sources to the default dbs 
-      dbSources = new String[defdb.length+osel];
+      // append the selected sequence sources to the default dbs
+      dbSources = new String[defdb.length + osel];
       System.arraycopy(defdb, 0, dbSources, 0, defdb.length);
-      for (int o=0,op=defdb.length; otherdb!=null && o<otherdb.length; o++)
+      for (int o = 0, op = defdb.length; otherdb != null
+              && o < otherdb.length; o++)
       {
-        if (otherdb[o]!=null)
+        if (otherdb[o] != null)
         {
           dbSources[op++] = otherdb[o];
         }
       }
-    } else {
-      // we assume the caller knows what they're doing and ensured that all the db source names are valid
+    }
+    else
+    {
+      // we assume the caller knows what they're doing and ensured that all the
+      // db source names are valid
       dbSources = sources;
     }
   }
+
   /**
-   * retrieve all the das sequence sources and add them to the list of db sources to retrieve from 
+   * retrieve all the das sequence sources and add them to the list of db
+   * sources to retrieve from
    */
   public void appendAllDasSources()
   {
     if (dbSources == null)
     {
-      dbSources = new String[] {};
+      dbSources = new String[]
+      {};
     }
     // append additional sources
-    String[] otherdb = sfetcher.getDbInstances(jalview.ws.dbsources.DasSequenceSource.class);
-    if (otherdb!=null && otherdb.length>0)
+    String[] otherdb = sfetcher
+            .getDbInstances(jalview.ws.dbsources.DasSequenceSource.class);
+    if (otherdb != null && otherdb.length > 0)
     {
-      String[] newsrc = new String[dbSources.length+otherdb.length];
-      System.arraycopy(dbSources, 0, newsrc,0,dbSources.length);
-      System.arraycopy(otherdb, 0, newsrc,dbSources.length, otherdb.length);
+      String[] newsrc = new String[dbSources.length + otherdb.length];
+      System.arraycopy(dbSources, 0, newsrc, 0, dbSources.length);
+      System
+              .arraycopy(otherdb, 0, newsrc, dbSources.length,
+                      otherdb.length);
       dbSources = newsrc;
     }
   }
+
   /**
    * start the fetcher thread
    * 
    * @param waitTillFinished
-   *                true to block until the fetcher has finished
+   *          true to block until the fetcher has finished
    */
   public void fetchDBRefs(boolean waitTillFinished)
   {
@@ -209,9 +232,9 @@ public class DBRefFetcher implements Runnable
    * could be either seq name or dbref id
    * 
    * @param seq
-   *                SequenceI
+   *          SequenceI
    * @param key
-   *                String
+   *          String
    */
   void addSeqId(SequenceI seq, String key)
   {
@@ -254,8 +277,13 @@ public class DBRefFetcher implements Runnable
     running = true;
     long startTime = System.currentTimeMillis();
     af.setProgressBar("Fetching db refs", startTime);
-    try {
-      picrClient = new uk.ac.ebi.www.picr.AccessionMappingService.AccessionMapperServiceLocator().getAccessionMapperPort(); 
+    try
+    {
+      if (Cache.getDefault("DBREFFETCH_USEPICR", false))
+      {
+        picrClient = new uk.ac.ebi.www.picr.AccessionMappingService.AccessionMapperServiceLocator()
+                .getAccessionMapperPort();
+      }
     } catch (Exception e)
     {
       System.err.println("Couldn't locate PICR service instance.\n");
@@ -304,10 +332,10 @@ public class DBRefFetcher implements Runnable
         {
           // Still queries to make for current seqIndex
           StringBuffer queryString = new StringBuffer("");
-          int numq=0,nqSize = (maxqlen > queries.size()) ? queries.size()
-                  : maxqlen;
-          
-          while (queries.size()>0 && numq < nqSize)
+          int numq = 0, nqSize = (maxqlen > queries.size()) ? queries
+                  .size() : maxqlen;
+
+          while (queries.size() > 0 && numq < nqSize)
           {
             String query = (String) queries.elementAt(0);
             if (dbsource.isValidReference(query))
@@ -326,7 +354,9 @@ public class DBRefFetcher implements Runnable
           {
             if (jalview.bin.Cache.log.isDebugEnabled())
             {
-              jalview.bin.Cache.log.debug("Querying "+dbsource.getDbName()+" with : '"+queryString.toString()+"'");
+              jalview.bin.Cache.log.debug("Querying "
+                      + dbsource.getDbName() + " with : '"
+                      + queryString.toString() + "'");
             }
             retrieved = dbsource.getSequenceRecords(queryString.toString());
           } catch (Exception ex)
@@ -353,7 +383,7 @@ public class DBRefFetcher implements Runnable
                     { dbSources[db] }); // jalview.datamodel.DBRefSource.UNIPROT
             // });
             // check for existing dbrefs to use
-            if (uprefs != null && uprefs.length>0)
+            if (uprefs != null && uprefs.length > 0)
             {
               for (int j = 0; j < uprefs.length; j++)
               {
@@ -372,25 +402,39 @@ public class DBRefFetcher implements Runnable
               {
                 String token = st.nextToken();
                 UPEntry[] presp = null;
-                try {
-                  presp=picrClient.getUPIForAccession(token, null, picrClient.getMappedDatabaseNames(), null, true);
-                } catch (Exception e) {
-                  System.err.println("Exception with Picr for '"+token+"'\n");
-                  e.printStackTrace();
+                if (picrClient != null)
+                {
+                  // resolve the string against PICR to recover valid IDs
+                  try
+                  {
+                    presp = picrClient
+                            .getUPIForAccession(token, null, picrClient
+                                    .getMappedDatabaseNames(), null, true);
+                  } catch (Exception e)
+                  {
+                    System.err.println("Exception with Picr for '" + token
+                            + "'\n");
+                    e.printStackTrace();
+                  }
                 }
-                if (presp!=null && presp.length>0)
+                if (presp != null && presp.length > 0)
                 {
-                  for (int id=0;id<presp.length; id++)
+                  for (int id = 0; id < presp.length; id++)
                   {
-                    // construct sequences from response if sequences are present, and do a transferReferences
+                    // construct sequences from response if sequences are
+                    // present, and do a transferReferences
                     // otherwise transfer non sequence x-references directly.
                   }
-                  System.out.println("Validated ID against PICR... (for what its worth):"+token);
+                  System.out
+                          .println("Validated ID against PICR... (for what its worth):"
+                                  + token);
                   addSeqId(sequence, token);
                   queries.addElement(token.toUpperCase());
-                } else {
-                  //if ()
-                  //System.out.println("Not querying source with token="+token+"\n");
+                }
+                else
+                {
+                  // if ()
+                  // System.out.println("Not querying source with token="+token+"\n");
                   addSeqId(sequence, token);
                   queries.addElement(token.toUpperCase());
                 }
@@ -431,13 +475,15 @@ public class DBRefFetcher implements Runnable
           AlignmentI retrievedAl) // File
   // file)
   {
-
     if (retrievedAl == null || retrievedAl.getHeight() == 0)
     {
       return;
     }
-    SequenceI[] retrieved = recoverDbSequences(retrievedAl.getSequencesArray());
+    SequenceI[] retrieved = recoverDbSequences(retrievedAl
+            .getSequencesArray());
     SequenceI sequence = null;
+    boolean transferred = false;
+    StringBuffer messages = new StringBuffer();
 
     // Vector entries = new Uniprot().getUniprotEntries(file);
 
@@ -454,27 +500,31 @@ public class DBRefFetcher implements Runnable
       DBRefEntry[] entryRefs = jalview.util.DBRefUtils.selectRefs(entry
               .getDBRef(), new String[]
       { dbSource });
+      if (entryRefs==null) {
+        System.err.println("Dud dbSource string ? no entryrefs selected for "+dbSource+ " on "+entry.getName());
+        continue;
+      }
       for (int j = 0; j < entryRefs.length; j++)
-      {
-        String accessionId = entryRefs[j].getAccessionId(); // .getAccession().elementAt(j).toString();
-        // match up on accessionId
-        if (seqRefs.containsKey(accessionId.toUpperCase()))
         {
-          Vector seqs = (Vector) seqRefs.get(accessionId);
-          for (int jj = 0; jj < seqs.size(); jj++)
+          String accessionId = entryRefs[j].getAccessionId(); // .getAccession().elementAt(j).toString();
+          // match up on accessionId
+          if (seqRefs.containsKey(accessionId.toUpperCase()))
           {
-            sequence = (SequenceI) seqs.elementAt(jj);
-            if (!sequenceMatches.contains(sequence))
+            Vector seqs = (Vector) seqRefs.get(accessionId);
+            for (int jj = 0; jj < seqs.size(); jj++)
             {
-              sequenceMatches.addElement(sequence);
+              sequence = (SequenceI) seqs.elementAt(jj);
+              if (!sequenceMatches.contains(sequence))
+              {
+                sequenceMatches.addElement(sequence);
+              }
             }
           }
         }
-      }
-      if (sequenceMatches.size() == 0)
-      {
-        // failed to match directly on accessionId==query so just compare all
-        // sequences to entry
+        if (sequenceMatches.size() == 0)
+        {
+          // failed to match directly on accessionId==query so just compare all
+          // sequences to entry
         Enumeration e = seqRefs.keys();
         while (e.hasMoreElements())
         {
@@ -530,11 +580,11 @@ public class DBRefFetcher implements Runnable
           absStart = nonGapped.indexOf(entrySeq);
           if (absStart == -1)
           { // verification failed.
-            sbuffer.append(sequence.getName()
+            messages.append(sequence.getName()
                     + " SEQUENCE NOT %100 MATCH \n");
             continue;
           }
-
+          transferred = true;
           sbuffer.append(sequence.getName() + " HAS " + absStart
                   + " PREFIXED RESIDUES COMPARED TO " + dbSource + "\n");
           //
@@ -554,6 +604,7 @@ public class DBRefFetcher implements Runnable
         }
         else
         {
+          transferred = true;
           // update start and end of local sequence to place it in entry's
           // reference frame.
           // apply identity map map from whole of local sequence to matching
@@ -565,8 +616,9 @@ public class DBRefFetcher implements Runnable
           // absStart+sequence.getStart()+entrySeq.length()-1},
           // new int[] { entry.getStart(), entry.getEnd() }, 1, 1);
           // relocate local features for updated start
-          if (updateRefFrame && sequence.getSequenceFeatures() != null)
-          {
+          if (updateRefFrame) {
+            if (sequence.getSequenceFeatures() != null)
+            {
             SequenceFeature[] sf = sequence.getSequenceFeatures();
             int start = sequence.getStart();
             int end = sequence.getEnd();
@@ -581,6 +633,7 @@ public class DBRefFetcher implements Runnable
                 sf[sfi].setEnd(sf[sfi].getEnd() + startShift);
               }
             }
+            }
           }
         }
 
@@ -595,39 +648,64 @@ public class DBRefFetcher implements Runnable
           // finally, update local sequence reference frame if we're allowed
           sequence.setStart(absStart);
           sequence.setEnd(absEnd);
+          // search for alignment sequences to update coordinate frame for
+          for (int alsq = 0; alsq<alseqs.length; alsq++)
+          {
+            if (alseqs[alsq].getDatasetSequence()==sequence)
+            {
+              String ngAlsq = AlignSeq.extractGaps("-. ",
+                      alseqs[alsq].getSequenceAsString()).toUpperCase();
+              int oldstrt = alseqs[alsq].getStart();
+              alseqs[alsq].setStart(sequence.getSequenceAsString().toUpperCase().indexOf(ngAlsq)+sequence.getStart());
+              if (oldstrt != alseqs[alsq].getStart()) {
+                alseqs[alsq].setEnd(ngAlsq.length()+alseqs[alsq].getStart()-1);
+              }
+            }
+          }
+          // TODO:  search for all other references to this dataset sequence, and update start/end
+          // TODO: update all AlCodonMappings which involve this alignment sequence (e.g. Q30167 cdna translation from exon2 product (vamsas demo)
         }
         // and remove it from the rest
         // TODO: decide if we should remove annotated sequence from set
         sdataset.remove(sequence);
-        // TODO: should we make a note of sequences that have received new DB ids, so we can query all enabled DAS servers for them ?
+        // TODO: should we make a note of sequences that have received new DB
+        // ids, so we can query all enabled DAS servers for them ?
       }
     }
+    if (!transferred)
+    {
+      // report the ID/sequence mismatches
+      sbuffer.append(messages);
+    }
   }
 
   /**
    * loop thru and collect additional sequences in Map.
+   * 
    * @param sequencesArray
    * @return
    */
   private SequenceI[] recoverDbSequences(SequenceI[] sequencesArray)
   {
     Vector nseq = new Vector();
-    for (int i=0;sequencesArray!=null && i<sequencesArray.length;i++)
+    for (int i = 0; sequencesArray != null && i < sequencesArray.length; i++)
     {
       nseq.addElement(sequencesArray[i]);
       DBRefEntry dbr[] = sequencesArray[i].getDBRef();
       jalview.datamodel.Mapping map = null;
-      for (int r=0;(dbr!=null) && r<dbr.length; r++) {
-        if ((map=dbr[r].getMap())!=null)
+      for (int r = 0; (dbr != null) && r < dbr.length; r++)
+      {
+        if ((map = dbr[r].getMap()) != null)
         {
-          if (!nseq.contains(map.getTo()))
+          if (map.getTo() != null && !nseq.contains(map.getTo()))
           {
             nseq.addElement(map.getTo());
           }
         }
       }
     }
-    if (nseq.size()>0) {
+    if (nseq.size() > 0)
+    {
       sequencesArray = new SequenceI[nseq.size()];
       nseq.toArray(sequencesArray);
     }