temporarily flagging EBI dbfetch/dbfetch to require server proxy

hansonr · hansonr · commit 71ef30b58a9a · 2018-08-23T09:43:08.000-05:00
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -840,8 +840,11 @@ if (!J2S._version)
 
 	J2S._isDirectCall = function(url) {
 		for ( var key in J2S.db._DirectDatabaseCalls) {
-			if (key.indexOf(".") >= 0 && url.indexOf(key) >= 0)
-				return true;
+			if (key.indexOf(".") >= 0 && url.indexOf(key) >= 0) {
+				// hack because ebi is not returning ajax calls
+				return url.indexOf(".ebi.ac.") < 0 || url.indexOf("dbfetch/dbfetch") < 0;
+								
+			}
 		}
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -840,8 +840,11 @@ if (!J2S._version)`
`840`	`840`
`841`	`841`	`J2S._isDirectCall = function(url) {`
`842`	`842`	`for ( var key in J2S.db._DirectDatabaseCalls) {`
`843`		`- if (key.indexOf(".") >= 0 && url.indexOf(key) >= 0)`
`844`		`- return true;`
	`843`	`+ if (key.indexOf(".") >= 0 && url.indexOf(key) >= 0) {`
	`844`	`+ // hack because ebi is not returning ajax calls`
	`845`	`+ return url.indexOf(".ebi.ac.") < 0 \|\| url.indexOf("dbfetch/dbfetch") < 0;`
	`846`	`+`
	`847`	`+ }`
`845`	`848`	`}`
`846`	`849`	`return false;`
`847`	`850`	`}`