Changeset 137 for prdatasets/pr_download.m

Timestamp:

12/18/19 15:46:35 (5 years ago)

Author:

bduin

Message:

 

Location:

prdatasets

Files:

• . (modified) (1 prop)
• pr_download.m (modified) (5 diffs)

prdatasets

@@ -3 +3 @@
 *.data
 *.asv
+data

@@ -3 +3 @@
 *.data
 *.asv
+data

prdatasets/pr_download.m

@@ -93 +93 @@
 %% find directory to be used
 if isempty(datname)
-  datname = callername;
+  datname = pr_callername;
   dirname = fullfile(fileparts(which(datname)),'data');
 else
@@ -212 +212 @@
   a = setname(a,opt.dsetname);
 else
-  a = setname(a,callername);
+  a = setname(a,pr_callername);
 end
 
@@ -224 +224 @@
 
 
-function ask_download(urlname,size)
+function ask_download(urlname,datsize)
 %% user controlled downloading
   global ASK
-  if isempty(ASK)
-    ASK = true;
-  end
-  
-  if ASK
-    if ~isempty(size) && size ~= 0
-      siz = ['(' num2str(size) ' MB)']; 
+  
+  if ASK && ~isempty(datsize) % ask only if datsize has been set
+    if datsize ~= 0
+      siz = ['(' num2str(datsize) ' MB)']; 
     else
       siz = '';
@@ -297 +294 @@
 return
 
-function name = callername
-%%
-[ss,~] = dbstack;
-if length(ss) < 3
-        name = [];
-else
-        name = ss(3).name;
-end
-
 function [a,new] = pr_download_old(url,varargin)
 %% This is the old version of pr_download, to be called from the old 
@@ -448 +436 @@
 disp('Parsing ...')
 c = mytextscan(fid,strrep(form,'n','s'),del,nhead);
-a = cell2dset(c,form,misval);
+a = pr_cell2dset(c,form,misval);
 
 if ~nosave % don't save if not needed (e.g. called by pr_download_uci)

@@ -3 +3 @@
 *.data
 *.asv
+data