Skip to content

Commit

Permalink
Release/1.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ToniWestbrook committed Jul 26, 2018
1 parent 5062651 commit ed6e57d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [1.4.3] - 2018-07-25
### Changed
- Changed all web requests from HTTP to HTTPS to accommodate UniProt's new requirements

## [1.4.2] - 2018-03-20
### Fixed
- Corrected issue that sometimes caused PALADIN to hang when downloading data from UniProt
Expand Down
2 changes: 1 addition & 1 deletion main.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#define PACKAGE_VERSION STR(PACKAGE_VERSION_MAJOR) "." STR(PACKAGE_VERSION_MINOR) "." STR(PACKAGE_VERSION_REV)
#define PACKAGE_VERSION_MAJOR 1
#define PACKAGE_VERSION_MINOR 4
#define PACKAGE_VERSION_REV 2
#define PACKAGE_VERSION_REV 3
#endif

// Render usage and version details
Expand Down
6 changes: 3 additions & 3 deletions uniprot.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ void retrieveUniprotOnline(UniprotList * passList, CURLBuffer * retBuffer, const
logMessage(__func__, LOG_LEVEL_MESSAGE, "Submitted %d of %d entries to UniProt...\n", entryIdx, passList->entryCount);

// Stage 1 - Submit query for processing
curl_easy_setopt(curlHandle, CURLOPT_URL, "http://www.uniprot.org/uploadlists/");
curl_easy_setopt(curlHandle, CURLOPT_URL, "https://www.uniprot.org/uploadlists/");
curl_easy_setopt(curlHandle, CURLOPT_POSTFIELDS, queryString);
curl_easy_setopt(curlHandle, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(curlHandle, CURLOPT_WRITEFUNCTION, receiveUniprotOutput);
Expand All @@ -288,7 +288,7 @@ void retrieveUniprotOnline(UniprotList * passList, CURLBuffer * retBuffer, const
continue;
}
sprintf(jobID, "%s", tempBuffer.buffer);
sprintf(queryString, "http://www.uniprot.org/jobs/%s.stat", jobID);
sprintf(queryString, "https://www.uniprot.org/jobs/%s.stat", jobID);

resetCURLBuffer(&tempBuffer);
curl_easy_setopt(curlHandle, CURLOPT_URL, queryString);
Expand All @@ -312,7 +312,7 @@ void retrieveUniprotOnline(UniprotList * passList, CURLBuffer * retBuffer, const

// Stage 3 - Retrieve Results
sprintf(queryString, "query=job:%s&format=tab&columns=entry%%20name,id,organism,protein%%20names,genes,pathway,features,go,reviewed,existence,comments,database(KEGG),database(GeneID),database(PATRIC),database(EnsemblBacteria)", jobID);
curl_easy_setopt(curlHandle, CURLOPT_URL, "http://www.uniprot.org/uniprot/");
curl_easy_setopt(curlHandle, CURLOPT_URL, "https://www.uniprot.org/uniprot/");
curl_easy_setopt(curlHandle, CURLOPT_WRITEDATA, retBuffer);

curlResult = curl_easy_perform(curlHandle);
Expand Down

0 comments on commit ed6e57d

Please sign in to comment.