Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
ensembl-gh-mirror
guiHive
Commits
d15a8c25
Commit
d15a8c25
authored
Jan 11, 2017
by
Leo Gordon
Browse files
bugfix: support drivers other than mysql
parent
9077c289
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
14 deletions
+19
-14
javascript/version_picker.js
javascript/version_picker.js
+18
-14
scripts/db_version.pl
scripts/db_version.pl
+1
-0
No files found.
javascript/version_picker.js
View file @
d15a8c25
...
...
@@ -43,20 +43,24 @@ function go_to_version_url (full_url) {
$
.
cookie
(
'
guihive_urls
'
,
cookie_obj
,
{
expires
:
7
});
var
cur_http_url
=
$
.
url
();
var
new_http_url
=
"
http://
"
+
cur_http_url
.
attr
(
"
host
"
)
+
"
:
"
+
cur_http_url
.
attr
(
"
port
"
)
+
"
/versions/
"
+
dbConn
.
out_msg
.
db_version
+
"
/?username=
"
+
dbConn
.
out_msg
.
user
+
"
&host=
"
+
dbConn
.
out_msg
.
host
+
"
&dbname=
"
+
dbConn
.
out_msg
.
dbname
+
"
&port=
"
+
dbConn
.
out_msg
.
port
;
cur_http_url
.
attr
(
"
host
"
)
+
"
:
"
+
cur_http_url
.
attr
(
"
port
"
)
+
"
/versions/
"
+
dbConn
.
out_msg
.
db_version
+
"
/?driver=
"
+
dbConn
.
out_msg
.
driver
+
"
&username=
"
+
dbConn
.
out_msg
.
user
+
"
&host=
"
+
dbConn
.
out_msg
.
host
+
"
&port=
"
+
dbConn
.
out_msg
.
port
+
"
&dbname=
"
+
dbConn
.
out_msg
.
dbname
;
if
(
dbConn
.
out_msg
.
passwd
!==
null
)
{
new_http_url
=
new_http_url
+
"
&passwd=xxxxx
"
;
}
...
...
@@ -86,7 +90,7 @@ function guess_database_url () {
loc
.
port
=
url
.
param
(
"
port
"
);
loc
.
dbname
=
url
.
param
(
"
dbname
"
);
loc
.
server
=
url
.
param
(
"
host
"
);
loc
.
driver
=
url
.
param
(
"
driver
"
)
||
"
mysql
"
;
loc
.
driver
=
url
.
param
(
"
driver
"
);
var
autoconnect
=
false
;
if
(
loc
.
user
!==
undefined
&&
loc
.
server
!==
undefined
&&
loc
.
dbname
!==
undefined
)
{
...
...
scripts/db_version.pl
View file @
d15a8c25
...
...
@@ -65,6 +65,7 @@ sub main {
my
$parsed_url
=
Bio::EnsEMBL::Hive::Utils::URL::
parse
(
$url
);
my
$json_obj
=
{
'
driver
'
=>
$parsed_url
->
{
driver
},
'
user
'
=>
$parsed_url
->
{
user
},
'
passwd
'
=>
$parsed_url
->
{
pass
},
'
host
'
=>
$parsed_url
->
{
host
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment