JAL-1136 give pre-existing custom settings a special name when job parameter settings...

[jalview.git] / src / jalview / gui / SequenceFetcher.java

diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index 9c51409..bf522ef 100755 (executable)
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -25,6 +25,9 @@ import java.awt.event.*;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
+
+import com.stevesoft.pat.Regex;
+
 import jalview.datamodel.*;
 import jalview.io.*;
 import jalview.util.DBRefUtils;
@@ -569,6 +572,18 @@ public class SequenceFetcher extends JPanel implements Runnable
               {
                 DBRefEntry dbr = new DBRefEntry(), found[] = null;
                 dbr.setSource(proxy.getDbSource());
+                dbr.setVersion(null);
+                if (proxy.getAccessionValidator()!=null) {
+                  Regex vgr=proxy.getAccessionValidator();
+                  vgr.search(q);
+                  if (vgr.numSubs()>0) {
+                    dbr.setAccessionId(vgr.stringMatched(1));
+                  } else {
+                    dbr.setAccessionId(vgr.stringMatched());
+                  }
+                } else {
+                  dbr.setAccessionId(q);
+                }
                 boolean rfound = false;
                 for (int r = 0; r < rs.length; r++)
                 {