Skip to content

Fixing issue173 #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benaliabderrahmane wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixing issue173 #320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ff1dc8
fixing issue 173
benaliabderrahmane Aug 6, 2021
149bc68
Add files via upload
benaliabderrahmane Aug 6, 2021
cfce1f0
Add files via upload
benaliabderrahmane Aug 6, 2021
fc2d031
Add files via upload
benaliabderrahmane Aug 6, 2021
a0e0a59
Add files via upload
benaliabderrahmane Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixing issue 173
  • Loading branch information
@benaliabderrahmane
benaliabderrahmane committed Aug 6, 2021
commit 2ff1dc85ccd17fd751f82d370622bee9cb567149
24 changes: 12 additions & 12 deletions plotly/plotly_aux/getuserdir.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
function userDir = getuserdir
% GETUSERDIR Retrieve the user directory
% - Under Windows returns the %APPDATA% directory
% - For other OSs uses java to retrieve the user.home directory
if ispc
% userDir = winqueryreg('HKEY_CURRENT_USER',...
% ['Software\Microsoft\Windows\CurrentVersion\' ...
% 'Explorer\Shell Folders'],'Personal');
userDir = getenv('appdata');
else
userDir = char(java.lang.System.getProperty('user.home'));
function userDir = getuserdir
% GETUSERDIR Retrieve the user directory
% - Under Windows returns the %APPDATA% directory
% - For other OSs uses java to retrieve the user.home directory

if ispc
% userDir = winqueryreg('HKEY_CURRENT_USER',...
% ['Software\Microsoft\Windows\CurrentVersion\' ...
% 'Explorer\Shell Folders'],'Personal');
userDir = getenv('appdata');
else
userDir = char(java.lang.System.getProperty('user.home'));
end
20 changes: 10 additions & 10 deletions plotly/plotly_aux/urlread2/http_createHeader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
function header = http_createHeader(name,value)
%http_createHeader Simple function for creating input header to urlread2
%
% header = http_createHeader(name,value)
%
% CODE: header = struct('name',name,'value',value);
%
% See Also:
% urlread2
function header = http_createHeader(name,value)
%http_createHeader Simple function for creating input header to urlread2
%
% header = http_createHeader(name,value)
%
% CODE: header = struct('name',name,'value',value);
%
% See Also:
% urlread2

header = struct('name',name,'value',value);
122 changes: 61 additions & 61 deletions plotly/plotly_aux/urlread2/http_paramsToString.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
function [str,header] = http_paramsToString(params,encodeOption)
%http_paramsToString Creates string for a POST or GET requests
%
% [queryString,header] = http_paramsToString(params, *encodeOption)
%
% INPUTS
% =======================================================================
% params: cell array of property/value pairs
% NOTE: If the input is in a 2 column matrix, then first column
% entries are properties and the second column entries are
% values, however this is NOT necessary (generally linear)
% encodeOption: (default 1)
% 1 - the typical URL encoding scheme (Java call)
%
% OUTPUTS
% =======================================================================
% queryString: querystring to add onto URL (LACKS "?", see example)
% header : the header that should be attached for post requests when
% using urlread2
%
% EXAMPLE:
% ==============================================================
% params = {'cmd' 'search' 'db' 'pubmed' 'term' 'wtf batman'};
% queryString = http_paramsToString(params);
% queryString => cmd=search&db=pubmed&term=wtf+batman
%
% IMPORTANT: This function does not filter parameters, sort them,
% or remove empty inputs (if necessary), this must be done before hand
if ~exist('encodeOption','var')
encodeOption = 1;
end
if size(params,2) == 2 && size(params,1) > 1
params = params';
params = params(:);
end
str = '';
for i=1:2:length(params)
if (i == 1), separator = ''; else separator = '&'; end
switch encodeOption
case 1
param = urlencode(params{i});
value = urlencode(params{i+1});
% case 2
% param = oauth.percentEncodeString(params{i});
% value = oauth.percentEncodeString(params{i+1});
% header = http_getContentTypeHeader(1);
otherwise
error('Case not used')
end
str = [str separator param '=' value]; %#ok<AGROW>
end
switch encodeOption
case 1
header = http_createHeader('Content-Type','application/x-www-form-urlencoded');
end
function [str,header] = http_paramsToString(params,encodeOption)
%http_paramsToString Creates string for a POST or GET requests
%
% [queryString,header] = http_paramsToString(params, *encodeOption)
%
% INPUTS
% =======================================================================
% params: cell array of property/value pairs
% NOTE: If the input is in a 2 column matrix, then first column
% entries are properties and the second column entries are
% values, however this is NOT necessary (generally linear)
% encodeOption: (default 1)
% 1 - the typical URL encoding scheme (Java call)
%
% OUTPUTS
% =======================================================================
% queryString: querystring to add onto URL (LACKS "?", see example)
% header : the header that should be attached for post requests when
% using urlread2
%
% EXAMPLE:
% ==============================================================
% params = {'cmd' 'search' 'db' 'pubmed' 'term' 'wtf batman'};
% queryString = http_paramsToString(params);
% queryString => cmd=search&db=pubmed&term=wtf+batman
%
% IMPORTANT: This function does not filter parameters, sort them,
% or remove empty inputs (if necessary), this must be done before hand

if ~exist('encodeOption','var')
encodeOption = 1;
end

if size(params,2) == 2 && size(params,1) > 1
params = params';
params = params(:);
end

str = '';
for i=1:2:length(params)
if (i == 1), separator = ''; else separator = '&'; end
switch encodeOption
case 1
param = urlencode(params{i});
value = urlencode(params{i+1});
% case 2
% param = oauth.percentEncodeString(params{i});
% value = oauth.percentEncodeString(params{i+1});
% header = http_getContentTypeHeader(1);
otherwise
error('Case not used')
end
str = [str separator param '=' value]; %#ok<AGROW>
end

switch encodeOption
case 1
header = http_createHeader('Content-Type','application/x-www-form-urlencoded');
end


end
Loading