X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FCrossRef.java;h=71b0aa0b9adb5cd92d39b5f7908fa3dcc349e4ed;hb=655b78299307682a4c7a6e5af0ed4618cbc9c924;hp=46e211995160b7ba78e6db73038185ad1e8eb57a;hpb=6e07596ded06cdd6fb75978a4ee9debb1294a17c;p=jalview.git

diff --git a/src/jalview/analysis/CrossRef.java b/src/jalview/analysis/CrossRef.java
index 46e2119..71b0aa0 100644
--- a/src/jalview/analysis/CrossRef.java
+++ b/src/jalview/analysis/CrossRef.java
@@ -421,19 +421,27 @@ public class CrossRef
 
     if (retrieved != null)
     {
-      updateDbrefMappings(seq, xrfs, retrieved, cf, fromDna);
+      boolean addedXref = false;
       for (SequenceI retrievedSequence : retrieved)
       {
         // dataset gets contaminated ccwith non-ds sequences. why ??!
         // try: Ensembl -> Nuc->Ensembl, Nuc->Uniprot-->Protein->EMBL->
         SequenceI retrievedDss = retrievedSequence.getDatasetSequence() == null ? retrievedSequence
                 : retrievedSequence.getDatasetSequence();
-        importCrossRefSeq(cf, dss, retrievedDss);
-        rseqs.add(retrievedDss);
-        if (dataset.findIndex(retrievedDss) == -1)
+        addedXref |= importCrossRefSeq(cf, dss, retrievedDss);
+      }
+      if (!addedXref)
+      {
+        // try again, after looking for matching IDs
+        // shouldn't need to do this unless the dbref mechanism has broken.
+        updateDbrefMappings(seq, xrfs, retrieved, cf, fromDna);
+        for (SequenceI retrievedSequence : retrieved)
         {
-          dataset.addSequence(retrievedDss);
-          matcher.add(retrievedDss);
+          // dataset gets contaminated ccwith non-ds sequences. why ??!
+          // try: Ensembl -> Nuc->Ensembl, Nuc->Uniprot-->Protein->EMBL->
+          SequenceI retrievedDss = retrievedSequence.getDatasetSequence() == null ? retrievedSequence
+                  : retrievedSequence.getDatasetSequence();
+          addedXref |= importCrossRefSeq(cf, dss, retrievedDss);
         }
       }
     }
@@ -483,15 +491,28 @@ public class CrossRef
    * @param cf
    * @param sourceSequence
    * @param retrievedSequence
+   * @return true if retrieveSequence was imported
    */
-  private void importCrossRefSeq(AlignedCodonFrame cf,
+  private boolean importCrossRefSeq(AlignedCodonFrame cf,
           SequenceI sourceSequence, SequenceI retrievedSequence)
   {
+    /**
+     * set when retrievedSequence has been verified as a crossreference for
+     * sourceSequence
+     */
+    boolean imported = false;
     DBRefEntry[] dbr = retrievedSequence.getDBRefs();
+    List<SequenceI> newDsSeqs = new ArrayList<SequenceI>();
     if (dbr != null)
     {
       for (DBRefEntry dbref : dbr)
       {
+        SequenceI matched = findInDataset(dbref);
+        if (matched == sourceSequence)
+        {
+          // verified retrieved and source sequence cross-reference each other
+          imported = true;
+        }
         // find any entry where we should put in the sequence being
         // cross-referenced into the map
         Mapping map = dbref.getMap();
@@ -499,61 +520,70 @@ public class CrossRef
         {
           if (map.getTo() != null && map.getMap() != null)
           {
-            // TODO findInDataset requires exact sequence match but
-            // 'congruent' test is only for the mapped part
-            // maybe not a problem in practice since only ENA provide a
-            // mapping and it is to the full protein translation of CDS
-            SequenceI matched = findInDataset(dbref);
-            // matcher.findIdMatch(map.getTo());
-            if (matched != null)
+            if (map.getTo() == sourceSequence)
             {
-              /*
-               * already got an xref to this sequence; update this
-               * map to point to the same sequence, and add
-               * any new dbrefs to it
-               */
-              DBRefEntry[] toRefs = map.getTo().getDBRefs();
-              if (toRefs != null)
-              {
-                for (DBRefEntry ref : toRefs)
-                {
-                  matched.addDBRef(ref); // add or update mapping
-                }
-              }
-              map.setTo(matched);
+              // already called to import once, and most likely this sequence
+              // already imported !
+              continue;
             }
-            else
+            if (matched == null)
             {
-              if (dataset.findIndex(map.getTo()) == -1)
-              {
-                dataset.addSequence(map.getTo());
-                matcher.add(map.getTo());
-              }
+              /*
+               * sequence is new to dataset, so save a reference so it can be added. 
+               */
+              newDsSeqs.add(map.getTo());
+              continue;
             }
 
+            /*
+             * there was a matching sequence in dataset, so now, check to see if we can update the map.getTo() sequence to the existing one.
+             */
+
             try
             {
               // compare ms with dss and replace with dss in mapping
               // if map is congruent
               SequenceI ms = map.getTo();
+              // TODO findInDataset requires exact sequence match but
+              // 'congruent' test is only for the mapped part
+              // maybe not a problem in practice since only ENA provide a
+              // mapping and it is to the full protein translation of CDS
+              // matcher.findIdMatch(map.getTo());
+              // TODO addendum: if matched is shorter than getTo, this will fail
+              // - when it should really succeed.
               int sf = map.getMap().getToLowest();
               int st = map.getMap().getToHighest();
               SequenceI mappedrg = ms.getSubSequence(sf, st);
               if (mappedrg.getLength() > 0
                       && ms.getSequenceAsString().equals(
-                              sourceSequence.getSequenceAsString()))
+                              matched.getSequenceAsString()))
               {
+                /*
+                 * sequences were a match, 
+                 */
                 String msg = "Mapping updated from " + ms.getName()
                         + " to retrieved crossreference "
-                        + sourceSequence.getName();
+                        + matched.getName();
                 System.out.println(msg);
-                map.setTo(sourceSequence);
+
+                DBRefEntry[] toRefs = map.getTo().getDBRefs();
+                if (toRefs != null)
+                {
+                  /*
+                   * transfer database refs
+                   */
+                  for (DBRefEntry ref : toRefs)
+                  {
+                    matched.addDBRef(ref); // add or update mapping
+                  }
+                }
+                map.setTo(matched);
 
                 /*
                  * give the reverse reference the inverse mapping 
                  * (if it doesn't have one already)
                  */
-                setReverseMapping(sourceSequence, dbref, cf);
+                setReverseMapping(matched, dbref, cf);
 
                 /*
                  * copy sequence features as well, avoiding
@@ -579,9 +609,10 @@ public class CrossRef
                         return super.equals(o, true);
                       }
                     };
-                    sourceSequence.addSequenceFeature(newFeature);
+                    matched.addSequenceFeature(newFeature);
                   }
                 }
+
               }
               cf.addMap(retrievedSequence, map.getTo(), map.getMap());
             } catch (Exception e)
@@ -594,7 +625,26 @@ public class CrossRef
         }
       }
     }
-    retrievedSequence.updatePDBIds();
+    if (imported)
+    {
+      retrievedSequence.updatePDBIds();
+      rseqs.add(retrievedSequence);
+      if (dataset.findIndex(retrievedSequence) == -1)
+      {
+        dataset.addSequence(retrievedSequence);
+        matcher.add(retrievedSequence);
+      }
+      for (SequenceI newToSeq : newDsSeqs)
+      {
+
+        if (dataset.findIndex(newToSeq) == -1)
+        {
+          dataset.addSequence(newToSeq);
+          matcher.add(newToSeq);
+        }
+      }
+    }
+    return imported;
   }
   /**
    * Sets the inverse sequence mapping in the corresponding dbref of the mapped