X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FDBRefFetcher.java;h=437fee78e54368c08951ac37449a3f0ca1f0ff1a;hb=00ac6f06b80b4a9b2b35490a7cb4033115390227;hp=23e5bf6a9eeca2b91761c0d960f15bf6adf73782;hpb=c9c74c082bdd9323850a864144dc8a9b36399157;p=jalview.git

diff --git a/src/jalview/io/DBRefFetcher.java b/src/jalview/io/DBRefFetcher.java
index 23e5bf6..437fee7 100644
--- a/src/jalview/io/DBRefFetcher.java
+++ b/src/jalview/io/DBRefFetcher.java
@@ -1,37 +1,31 @@
 /*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.io;
 
-import jalview.datamodel.*;
-
-import jalview.gui.*;
-
 import java.io.*;
-
 import java.util.*;
 
-import org.exolab.castor.mapping.Mapping;
-
+import org.exolab.castor.mapping.*;
 import org.exolab.castor.xml.*;
-import jalview.analysis.AlignSeq;
-
-
+import jalview.analysis.*;
+import jalview.datamodel.*;
+import jalview.gui.*;
 
 /**
  * DOCUMENT ME!
@@ -39,17 +33,19 @@ import jalview.analysis.AlignSeq;
  * @author $author$
  * @version $Revision$
  */
-public class DBRefFetcher implements Runnable
+public class DBRefFetcher
+    implements Runnable
 {
-  AlignmentI align;
   AlignmentI dataset;
   AlignFrame af;
-  ArrayList unknownSequences;
   CutAndPasteTransfer output = new CutAndPasteTransfer();
   StringBuffer sbuffer = new StringBuffer();
-  boolean uniprotFlag = false;
   boolean running = false;
 
+  ///This will be a collection of Vectors of sequenceI refs.
+  //The key will be the seq name or accession id of the seq
+  Hashtable seqRefs;
+
   public DBRefFetcher()
   {}
 
@@ -59,7 +55,7 @@ public class DBRefFetcher implements Runnable
     try
     {
       // 1. Load the mapping information from the file
-      Mapping map = new Mapping(uni.getClass().getClassLoader());
+      org.exolab.castor.mapping.Mapping map = new org.exolab.castor.mapping.Mapping(uni.getClass().getClassLoader());
       java.net.URL url = getClass().getResource("/uniprot_mapping.xml");
       map.loadMapping(url);
 
@@ -67,16 +63,14 @@ public class DBRefFetcher implements Runnable
       Unmarshaller unmar = new Unmarshaller(uni);
       unmar.setIgnoreExtraElements(true);
       unmar.setMapping(map);
-   //   unmar.setDebug(true);
 
       uni = (UniprotFile) unmar.unmarshal(new FileReader(file));
     }
     catch (Exception e)
     {
-      System.out.println("Error getUniprotEntries() "+e);
+      System.out.println("Error getUniprotEntries() " + e);
     }
 
-
     return uni.getUniprotEntries();
   }
 
@@ -89,8 +83,6 @@ public class DBRefFetcher implements Runnable
   public DBRefFetcher(AlignmentI align, AlignFrame af)
   {
     this.af = af;
-    unknownSequences = new ArrayList();
-    this.align = align;
     this.dataset = align.getDataset();
   }
 
@@ -100,13 +92,16 @@ public class DBRefFetcher implements Runnable
     thread.start();
     running = true;
 
-    if(waitTillFinished)
+    if (waitTillFinished)
     {
-      while(running)
+      while (running)
       {
-        try{
+        try
+        {
           Thread.sleep(500);
-        }catch(Exception ex){}
+        }
+        catch (Exception ex)
+        {}
       }
     }
 
@@ -114,6 +109,41 @@ public class DBRefFetcher implements Runnable
   }
 
   /**
+   * The sequence will be added to a vector of sequences
+   * belonging to key which could be either seq name or dbref id
+   * @param seq SequenceI
+   * @param key String
+   */
+  void addSeqId(SequenceI seq, String key)
+  {
+    key = key.toUpperCase();
+
+    Vector seqs;
+    if (seqRefs.containsKey(key))
+    {
+      seqs = (Vector) seqRefs.get(key);
+
+      if (seqs != null && !seqs.contains(seq))
+      {
+        seqs.addElement(seq);
+      }
+      else if (seqs == null)
+      {
+        seqs = new Vector();
+        seqs.addElement(seq);
+      }
+
+    }
+    else
+    {
+      seqs = new Vector();
+      seqs.addElement(seq);
+    }
+
+    seqRefs.put(key, seqs);
+  }
+
+  /**
    * DOCUMENT ME!
    */
   public void run()
@@ -122,6 +152,8 @@ public class DBRefFetcher implements Runnable
     af.setProgressBar("Fetching db refs", startTime);
     running = true;
 
+    seqRefs = new Hashtable();
+
     try
     {
       int seqIndex = 0;
@@ -129,58 +161,56 @@ public class DBRefFetcher implements Runnable
 
       while (seqIndex < sequences.size())
       {
-        Vector ids = new Vector();
+        StringBuffer queryString = new StringBuffer("uniprot:");
 
         for (int i = 0; (seqIndex < sequences.size()) && (i < 50);
              seqIndex++, i++)
         {
           Sequence sequence = (Sequence) sequences.get(seqIndex);
-          DBRefEntry [] uprefs = jalview.util.DBRefUtils.selectRefs(sequence.getDBRef(), new String[] {
+          DBRefEntry[] uprefs = jalview.util.DBRefUtils.selectRefs(sequence.
+              getDBRef(), new String[]
+              {
               jalview.datamodel.DBRefSource.UNIPROT});
-          if (uprefs!=null)
+          if (uprefs != null)
+          {
+            if (uprefs.length + i > 50)
+            {
+              break;
+            }
+
+            for (int j = 0; j < uprefs.length; j++)
+            {
+              addSeqId(sequence, uprefs[j].getAccessionId());
+              queryString.append(uprefs[j].getAccessionId() + ";");
+            }
+          }
+          else
           {
-            // we know the id for this entry, so don't note its ID in the unknownSequences list
-            for (int j=0,k=uprefs.length; j<k; j++)
-              ids.add(uprefs[j].getAccessionId());
-            unknownSequences.add(sequence);
-          } else {
-            if (!ids.contains(sequence.getName()))
+            StringTokenizer st = new StringTokenizer(sequence.getName(), "|");
+            if (st.countTokens() + i > 50)
             {
-              ids.add(sequence.getName());
-              unknownSequences.add(sequence);
+              //Dont send more than 50 id strings to dbFetch!!
+              seqIndex--;
+            }
+            else
+            {
+              while (st.hasMoreTokens())
+              {
+                String token = st.nextToken();
+                addSeqId(sequence, token);
+                queryString.append(token + ";");
+              }
             }
           }
         }
 
         ///////////////////////////////////
         ///READ FROM EBI
-        if (ids.size() > 0)
+        EBIFetchClient ebi = new EBIFetchClient();
+        File file = ebi.fetchDataAsFile(queryString.toString(), "xml", "raw");
+        if (file != null)
         {
-          StringBuffer remainingIds = new StringBuffer("uniprot:");
-          for (int i = 0; i < ids.size(); i++)
-           {
-             if(ids.get(i).toString().indexOf("|")>-1)
-             {
-               remainingIds.append(ids.get(i).toString().substring(
-                   ids.get(i).toString().lastIndexOf("|") + 1));
-               uniprotFlag = true;
-             }
-             else
-               remainingIds.append(ids.get(i));
-
-             remainingIds.append(";");
-           }
-
-          EBIFetchClient ebi = new EBIFetchClient();
-          File file = ebi.fetchDataAsFile(remainingIds.toString(),
-                                          "xml", "raw");
-
-
-
-          if (file != null)
-          {
-            ReadUniprotFile(file, ids);
-          }
+          ReadUniprotFile(file);
         }
       }
     }
@@ -203,35 +233,12 @@ public class DBRefFetcher implements Runnable
     }
 
     af.setProgressBar("DBRef search completed", startTime);
-   // promptBeforeBlast();
+    // promptBeforeBlast();
 
-   running = false;
+    running = false;
 
   }
 
-
-  void promptBeforeBlast()
-   {
-     // This must be outside the run() body as java 1.5
-     // will not return any value from the OptionPane to the expired thread.
-      if (unknownSequences.size() > 0)
-      {
-       // int reply = javax.swing.JOptionPane.showConfirmDialog(
-       //     Desktop.desktop, "Couldn't find a match for "+unknownSequences.size()+" sequences."
-        //        +"\nPerform blast for unknown sequences?",
-        //            "Blast for Unidentified Sequences",
-        //             javax.swing.JOptionPane.YES_NO_OPTION, javax.swing.JOptionPane.QUESTION_MESSAGE);
-     javax.swing.JOptionPane.showMessageDialog(
-    Desktop.desktop, "Couldn't find a match for "+unknownSequences.size()+" sequences.",
-            "Unidentified Sequences",
-             javax.swing.JOptionPane.WARNING_MESSAGE);
-
-
-      //  if(reply == javax.swing.JOptionPane.YES_OPTION)
-     //    new WSWUBlastClient(ap, align, unknownSequences);
-      }
-  }
-
   /**
    * DOCUMENT ME!
    *
@@ -239,124 +246,135 @@ public class DBRefFetcher implements Runnable
    * @param out DOCUMENT ME!
    * @param align DOCUMENT ME!
    */
-  void ReadUniprotFile(File file, Vector ids)
+  void ReadUniprotFile(File file)
   {
-    if(!file.exists())
+    if (!file.exists())
+    {
       return;
+    }
 
-    SequenceI [] sequence = null;
+    SequenceI sequence = null;
 
     Vector entries = getUniprotEntries(file);
 
-    int i, iSize = entries==null?0:entries.size();
+    int i, iSize = entries == null ? 0 : entries.size();
     UniprotEntry entry;
     for (i = 0; i < iSize; i++)
     {
       entry = (UniprotEntry) entries.elementAt(i);
-      String idmatch = entry.getAccession().elementAt(0).toString();
-      sequence = dataset.findSequenceMatch(idmatch);
 
-      if (sequence.length==0)
+      //Work out which sequences this Uniprot file has matches to,
+      //taking into account all accessionIds and names in the file
+      Vector sequenceMatches = new Vector();
+      for (int j = 0; j < entry.getAccession().size(); j++)
       {
-        //Sequence maybe Name, not Accession
-        idmatch = entry.getName().elementAt(0).toString();
-        sequence = dataset.findSequenceMatch(idmatch);
-      }
-
-      if(sequence.length>0)
-        ids.remove(sequence[0].getName());
-
-      else  if (sequence.length==0 && uniprotFlag)
-      {
-          StringBuffer upid = new StringBuffer("UniProt/Swiss-Prot|");
-          for(int u=0; u<entry.getAccession().size(); u++)
-            upid.append(entry.getAccession().elementAt(u)+"|");
-
-          sequence = dataset.findSequenceMatch(upid+idmatch);
-          ids.remove(idmatch);
+        String accessionId = entry.getAccession().elementAt(j).toString();
+        if (seqRefs.containsKey(accessionId))
+        {
+          Vector seqs = (Vector) seqRefs.get(accessionId);
+          for (int jj = 0; jj < seqs.size(); jj++)
+          {
+            sequence = (SequenceI) seqs.elementAt(jj);
+            if (!sequenceMatches.contains(sequence))
+            {
+              sequenceMatches.addElement(sequence);
+            }
+          }
+        }
       }
-
-      if(sequence.length==0)
+      for (int j = 0; j < entry.getName().size(); j++)
       {
-        System.out.println(idmatch+" not found");
-        continue;
+        String name = entry.getName().elementAt(j).toString();
+        if (seqRefs.containsKey(name))
+        {
+          Vector seqs = (Vector) seqRefs.get(name);
+          for (int jj = 0; jj < seqs.size(); jj++)
+          {
+            sequence = (SequenceI) seqs.elementAt(jj);
+            if (!sequenceMatches.contains(sequence))
+            {
+              sequenceMatches.addElement(sequence);
+            }
+          }
+        }
       }
 
-      for(int m=0; m<sequence.length; m++)
+      for (int m = 0; m < sequenceMatches.size(); m++)
       {
+        sequence = (SequenceI) sequenceMatches.elementAt(m);
+        sequence.addDBRef(new DBRefEntry(DBRefSource.UNIPROT,
+                                         "0",
+                                         entry.getAccession().elementAt(0).
+                                         toString()));
 
-      sequence[m].addDBRef(new DBRefEntry(DBRefSource.UNIPROT,
-                                       "0",
-                                       entry.getAccession().elementAt(0).toString()));
-
-      System.out.println("Adding dbref to "+sequence[m].getName()+" : "+
-                         entry.getAccession().elementAt(0).toString());
-
-      String nonGapped = AlignSeq.extractGaps("-. ", sequence[m].getSequence());
-
-      int absStart = entry.getUniprotSequence().getContent().indexOf(
-          nonGapped.toString());
+        System.out.println("Adding dbref to " + sequence.getName() + " : " +
+                           entry.getAccession().elementAt(0).toString());
 
-      if (absStart == -1)
-      {
-        // Is UniprotSequence contained in dataset sequence?
-        absStart = nonGapped.toString().indexOf(entry.getUniprotSequence().getContent());
-        if(absStart == -1)
-        {
-          sbuffer.append(sequence[m].getName() +
-                         " SEQUENCE NOT %100 MATCH \n");
+        String nonGapped = AlignSeq.extractGaps("-. ",
+                                                sequence.getSequenceAsString()).
+            toUpperCase();
 
-          continue;
-        }
+        int absStart = entry.getUniprotSequence().getContent().indexOf(
+            nonGapped.toString());
 
-        if (entry.getFeature() != null)
+        if (absStart == -1)
         {
-          Enumeration e = entry.getFeature().elements();
-          while (e.hasMoreElements())
+          // Is UniprotSequence contained in dataset sequence?
+          absStart = nonGapped.toString().indexOf(entry.getUniprotSequence().
+                                                  getContent());
+          if (absStart == -1)
           {
-            SequenceFeature sf = (SequenceFeature) e.nextElement();
-            sf.setBegin(sf.getBegin() + absStart + 1);
-            sf.setEnd(sf.getEnd() + absStart + 1);
+            sbuffer.append(sequence.getName() + " SEQUENCE NOT %100 MATCH \n");
+            continue;
           }
 
-          sbuffer.append(sequence[m].getName() +
-                         " HAS " + absStart +
-              " PREFIXED RESIDUES COMPARED TO UNIPROT - ANY SEQUENCE FEATURES"
-                         + " HAVE BEEN ADJUSTED ACCORDINGLY \n");
-          absStart = 0;
-        }
+          if (entry.getFeature() != null)
+          {
+            Enumeration e = entry.getFeature().elements();
+            while (e.hasMoreElements())
+            {
+              SequenceFeature sf = (SequenceFeature) e.nextElement();
+              sf.setBegin(sf.getBegin() + absStart + 1);
+              sf.setEnd(sf.getEnd() + absStart + 1);
+            }
 
-      }
+            sbuffer.append(sequence.getName() +
+                           " HAS " + absStart +
+                           " PREFIXED RESIDUES COMPARED TO UNIPROT - ANY SEQUENCE FEATURES"
+                           + " HAVE BEEN ADJUSTED ACCORDINGLY \n");
+            absStart = 0;
+          }
 
-      unknownSequences.remove(sequence);
+        }
 
-      int absEnd = absStart + nonGapped.toString().length();
-      absStart += 1;
+        //unknownSequences.remove(sequence);
 
-      Enumeration e = entry.getDbReference().elements();
-      Vector onlyPdbEntries = new Vector();
-      while(e.hasMoreElements())
-      {
-        PDBEntry pdb = (PDBEntry)e.nextElement();
-        if(!pdb.getType().equals(DBRefSource.PDB))
-          continue;
+        int absEnd = absStart + nonGapped.toString().length();
+        absStart += 1;
 
-        sequence[m].addDBRef(new DBRefEntry(DBRefSource.PDB,
-                                       "0",
-                                       pdb.getId()));
+        Enumeration e = entry.getDbReference().elements();
+        Vector onlyPdbEntries = new Vector();
+        while (e.hasMoreElements())
+        {
+          PDBEntry pdb = (PDBEntry) e.nextElement();
+          if (!pdb.getType().equals(DBRefSource.PDB))
+          {
+            continue;
+          }
 
-        onlyPdbEntries.addElement(pdb);
-      }
+          sequence.addDBRef(new DBRefEntry(DBRefSource.PDB,
+                                           "0",
+                                           pdb.getId()));
 
-      sequence[m].setPDBId(onlyPdbEntries);
+          onlyPdbEntries.addElement(pdb);
+        }
 
-      sequence[m].setStart(absStart);
-      sequence[m].setEnd(absEnd);
+        sequence.setPDBId(onlyPdbEntries);
 
+        sequence.setStart(absStart);
+        sequence.setEnd(absEnd);
 
       }
     }
   }
 }
-
-