Commit 3ff7d474 authored by Mikael Boden's avatar Mikael Boden

update_uniprot_API

parent 6727521b
...@@ -19,7 +19,7 @@ import json ...@@ -19,7 +19,7 @@ import json
__ebiUrl__ = 'http://www.ebi.ac.uk/Tools/' __ebiUrl__ = 'http://www.ebi.ac.uk/Tools/'
__ebiGOUrl__ = 'https://www.ebi.ac.uk/QuickGO/services/' __ebiGOUrl__ = 'https://www.ebi.ac.uk/QuickGO/services/'
__uniprotUrl__ = 'http://www.uniprot.org/' __uniprotUrl__ = 'http://rest.uniprot.org/'
__ebiSearchUrl__ = 'http://www.ebi.ac.uk/ebisearch/' __ebiSearchUrl__ = 'http://www.ebi.ac.uk/ebisearch/'
...@@ -58,11 +58,11 @@ def search(query, dbName='uniprot', format='list', limit=100, columns=""): ...@@ -58,11 +58,11 @@ def search(query, dbName='uniprot', format='list', limit=100, columns=""):
if dbName.startswith('uniprot'): if dbName.startswith('uniprot'):
# Construct URL # Construct URL
if limit == None: # no limit to number of results returned if limit == None: # no limit to number of results returned
url = "{}{}/?format={}&query={}&columns={}".format(__uniprotUrl__, dbName, format, url = "{}{}/search?&format={}&query={}&columns={}".format(__uniprotUrl__, dbName, format,
urllib.parse.quote(query), urllib.parse.quote(query),
columns) columns)
else: else:
url = "{}{}/?format={}&limit={}&query={}&columns={}".format(__uniprotUrl__, dbName, format, str(limit), url = "{}{}/search?format={}&limit={}&query={}&columns={}".format(__uniprotUrl__, dbName, format, str(limit),
urllib.parse.quote(query), columns) urllib.parse.quote(query), columns)
# Get the entries # Get the entries
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment