first effort for GNU Octave compatibility (sefran3)

Author: beaudu

CODE/matlab/rgb.m

@@ -15,7 +15,7 @@
 %
 %	Author: Francois Beauducel <[email protected]>
 %	Created: 2008-11-10 in Paris, France
-%	Updated: 2022-06-12
+%	Updated: 2022-07-22
 
 html = [ ...
 {'AliceBlue','#F0F8FF'};
@@ -187,7 +187,7 @@
 	end
 	htm{i} = s;
 	if length(s) >= 6
-		s = regexprep(s,'\','');
+		s = regexprep(s,'\\','');
 		if strcmp(s(1),'#')
 			s = s(2:end);
 		else
@@ -204,4 +204,3 @@
 		rgb(i,:) = [hex2dec(rr),hex2dec(gg),hex2dec(bb)]/255;
 	end
 end
-

CODE/matlab/superprocs/sefran3.m

@@ -20,7 +20,7 @@ function sefran3(name,fdate)
 %	Authors: Francois Beauducel, Didier Lafon, Alexis Bosson, Jean-Marie Saurel, WEBOBS/IPGP
 %	Created: 2012-02-09 in Paris, France
 %	         (based on legacy sefran.m, 2002 and sefran2.m, 2007)
-%	Updated: 2022-06-12
+%	Updated: 2022-07-22
 
 WO = readcfg;
 wofun = sprintf('WEBOBS{%s}',mfilename);
@@ -137,7 +137,7 @@ function sefran3(name,fdate)
 
 % imports SEFRAN3 channel parameters
 fid = fopen(SEFRAN3.CHANNEL_CONF,'rt');
-C = textscan(fid,'%q%q%q%q%q%q%q%*[^\n]','CommentStyle','#');
+C = textscan(fid,'%q%q%q%q%q%q%q','CommentStyle','#');
 fclose(fid);
 % C{1} = channel name (alias)
 % C{2} = channel stream
@@ -191,7 +191,7 @@ function sefran3(name,fdate)
 		t1 = t0 + daymn;
 		tv = datevec(t0);
 		pdat = sprintf('%s/%4d/%4d%02d%02d',SEFRAN3.ROOT,tv(1),tv(1:3));
-		f = sprintf('%s/%s/%4d%02d%02d%02d%02d%02d',pdat,SEFRAN3.PATH_IMAGES_MINUTE,tv);
+		f = sprintf('%s/%s/%4d%02d%02d%02d%02d%02.0f',pdat,SEFRAN3.PATH_IMAGES_MINUTE,tv);
 		fpng = sprintf('%s.png',f);
 		fpng_high = sprintf('%s_high.png',f);
 
@@ -466,7 +466,7 @@ function sefran3(name,fdate)
 					else
 						pngq = '';
 					end
-					fpng = sprintf('%s/%s/%4d%02d%02d%02d%02d%02ds.png',pdat,sgrampath,tv);
+					fpng = sprintf('%s/%s/%4d%02d%02d%02d%02d%02.0fs.png',pdat,sgrampath,tv);
 					fprintf('%s: creating %s ... ',wofun,fpng);
 					ftmp3 = sprintf('%s/sgram.eps',ptmp);
 					fsxy = [vits,hip]; % image size (in inches)
@@ -691,7 +691,7 @@ function sefran3(name,fdate)
 			dt = 0;
 		end
 		% makes SeedLink request and save to temporary miniseed file
-		wosystem(sprintf('%s -d -o %s -S "%s" -tw %d,%d,%d,%d,%d,%d:%g,%d,%d,%d,%d,%g %s', ...
+		wosystem(sprintf('%s -d -o %s -S "%s" -tw %d,%d,%d,%d,%d,%1.0f:%d,%d,%d,%d,%d,%1.0f %s', ...
 			slinktool,fmsd,streams,datevec(t0-max(dt)),datevec(t1),datasource),SEFRAN3,'warning');
 	else
 		fprintf('%s: ** WARNING ** SEEDLINK server %s at %s has no channel available !\n',wofun,datasource,datestr(t1));
@@ -709,7 +709,7 @@ function sefran3(name,fdate)
 	fid = fopen(freq,'wt');
 	for n = 1:length(sfr)
 		c = textscan(sfr{n},'%s','Delimiter','.:'); % splits Network, Station, Loc and Channel codes
-		fprintf(fid,'%d,%d,%d,%d,%d,%g %d,%d,%d,%d,%d,%g %s %s %s %s\n',datevec(t0-dt0(n)),datevec(t1),c{1}{1},c{1}{2},c{1}{4},c{1}{3});
+		fprintf(fid,'%d,%d,%d,%d,%d,%1.0f %d,%d,%d,%d,%d,%1.0f %s %s %s %s\n',datevec(t0-dt0(n)),datevec(t1),c{1}{1},c{1}{2},c{1}{4},c{1}{3});
 	end
 	fclose(fid);
 	% makes ArcLink request and save to temporary miniseed file
@@ -732,6 +732,7 @@ function sefran3(name,fdate)
 		% builds request line for dataselect WebService POST file
 		fprintf(fid,'%s %s %s %s %04d-%02d-%02dT%02d:%02d:%02.0f %04d-%02d-%02dT%02d:%02d:%02.0f\n',c{1}{1},c{1}{2},c{1}{3},c{1}{4},datevec(t0-dt0(n)),datevec(t1));
 	end
+	fclose(fid);
 	% request the data
 	wosystem(sprintf('wget -nv -O %s --post-file %s "%s"',fmsd,fpost,datasource),SEFRAN3);
 

CODE/matlab/wosystem.m

@@ -1,11 +1,11 @@
 function varargout = wosystem(cmd,varargin)
 %WOSYSTEM Execute system command and return result.
-%	[status,result] = WOSYSTEM('command') works exactly like SYSTEM() 
+%	[status,result] = WOSYSTEM('command') works exactly like SYSTEM()
 %	function excepted it displays the result string in case of command
 %	error, i.e., non-null exit status (return code).
 %
-%	WOSYSTEM('command') without output argument, or 
-%	[status,result] = WOSYSTEM('command','error') both will produce a 
+%	WOSYSTEM('command') without output argument, or
+%	[status,result] = WOSYSTEM('command','error') both will produce a
 %	Matlab error if the command is unsuccessful.
 %
 %	WOSYSTEM('command','warning') without output argument forces the
@@ -25,7 +25,7 @@
 %
 %	Author: F. Beauducel, WEBOBS
 %	Created: 2017-02-02 in Yogyakarta, Indonesia
-%	Updated: 2017-09-11
+%	Updated: 2022-07-22
 
 if nargin < 1
 	error('Not enough input argument.');
@@ -44,12 +44,12 @@
 [s,w] = system(cmd);
 
 if s || any(strcmpi(varargin,'debug')) || (nargin > 1 && (isok(varargin{1},'DEBUG')))
-	display(regexprep(msg,'\','\\'));
+	display(regexprep(msg,'\\','\\\'));
 end
 
 % if unsuccessful, displays the result
 if s
-	% ERROR mode: will stop with error if command unsuccessful 
+	% ERROR mode: will stop with error if command unsuccessful
 	if (nargout == 0 || any(strcmpi(varargin,'error'))) && ~any(strcmpi(varargin,'warning'))
 		error('%s command unsuccessful [rc = %d]: %s',wofun,s,w);
 	else