=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v retrieving revision 1.26 retrieving revision 1.32 diff -u -p -r1.26 -r1.32 --- OpenXM/src/kan96xx/Doc/httpd-asir.sm1 2005/11/17 08:15:51 1.26 +++ OpenXM/src/kan96xx/Doc/httpd-asir.sm1 2014/08/29 11:58:05 1.32 @@ -1,4 +1,4 @@ -%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v 1.25 2003/09/14 01:59:56 takayama Exp $ +%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v 1.31 2014/08/28 11:27:34 takayama Exp $ %% http server by sm1 [(parse) (httpd.sm1) pushfile] extension pop @@ -55,7 +55,7 @@ def /httpd.port 1200 rrr add def httpd.port message - %%[(sleep 3; netscape -geometry 800x500 http://localhost:) + %%[(sleep 3; firefox -geometry 800x500 http://localhost:) %% httpd.port toString %% ( &)] cat system [(ostype)] extension 0 get @@ -212,10 +212,10 @@ def /httpd.asirman - ("http://www.math.sci.kobe-u.ac.jp/OpenXM/Current/doc/asir2000/html-jp/man_toc.html") + ("http://www.math.sci.kobe-u.ac.jp/OpenXM/Current/doc/asir2000/html-ja/man_toc.html") def /httpd.asirman.contrib - ("http://www.math.sci.kobe-u.ac.jp/OpenXM/Current/doc/asir-contrib/html-ja/cman-ja_toc.html") + ("http://www.math.sci.kobe-u.ac.jp/OpenXM/Current/doc/asir-contrib/ja/cman-html/cman-ja_toc.html") def /httpd.asir.intro ("http://www.math.sci.kobe-u.ac.jp/~taka/asir-book-html/main") @@ -281,7 +281,7 @@ def msg2 0 get (httpdAsirMeta) eq msg2 1 get (Pretty) eq and { - httpd.image.type null eq { + httpd.image.type tag 0 eq { send-page-warning-image /skip-image goto } { } ifelse @@ -332,4 +332,26 @@ def ] pop popVariables arg1 +} def + +/webasir2 { + [/rrr /cmd /mypid /lockname] pushVariables + [ + %% This procedure to generate port number might fail. + [(oxGenPass)] extension . (integer) dc /rrr set + rrr << rrr 20000 idiv 20000 mul >> sub /rrr set + /httpd.port 1200 rrr add def + httpd.port message + + [(getpid)] extension (dollar) dc /mypid set + [(/tmp/webasir-) mypid (.txt)] cat /lockname set + [(outputObjectToFile) lockname + [httpd.port nl httpd.textarea.name nl ] cat + ] extension + lockname message + [(cat ) lockname] cat (system) nl message + httpd ; + [(rm -f ) lockname] cat system + ] pop + popVariables } def