diff --git a/app/pages/molviewer.html b/app/pages/molviewer.html index e672823..1b6baf9 100644 --- a/app/pages/molviewer.html +++ b/app/pages/molviewer.html @@ -171,11 +171,11 @@

Predicted Carbohydrate Binding -
+
-
+
@@ -186,12 +186,12 @@

Predicted Carbohydrate Binding

-
+
-
+
diff --git a/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView.Base.js b/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView.Base.js index 2a80554..c1bcc84 100644 --- a/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView.Base.js +++ b/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView.Base.js @@ -156,7 +156,8 @@ //-------end //try to get the agi (gene id) from its file name, will happen when running at eplant (bar.utoronto.ca) - var agi = load.substring( load.lastIndexOf('_')+1, load.lastIndexOf('.'));//format Phyre2_AT1G01200.1.pdb + //var agi = load.substring( load.lastIndexOf('_')+1, load.lastIndexOf('.'));//format Phyre2_AT1G01200.1.pdb + var agi = this.info.identifier;//format Phyre2_AT1G01200.1.pdb if(agi) this.mySequence.agi = agi; diff --git a/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js b/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js index cd573f1..b275325 100644 --- a/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js +++ b/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js @@ -190,8 +190,9 @@ this.moleculeModelRawText = JSON.stringify(response); var fileLink = ""; fileLink = response.link.match("Phyre2_AT.+pdb"); - if (fileLink == "") { - fileLink = response.link.match("....\.pdb"); + // Araport + if (fileLink == null ) { + fileLink = response.link.match("....\.pdb$"); } $.ajax({ beforeSend: function(request) {