=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd.sm1,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM/src/kan96xx/Doc/httpd.sm1 2001/08/23 00:49:00 1.2 +++ OpenXM/src/kan96xx/Doc/httpd.sm1 2002/10/21 01:59:15 1.7 @@ -1,7 +1,11 @@ -%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd.sm1,v 1.1 2001/08/23 00:16:55 takayama Exp $ +%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd.sm1,v 1.6 2002/10/17 13:40:28 takayama Exp $ %% common modules for httpd on sm1. /Oxserver_history_variable (Oxserver_history_variable_) def +/httpd.image.type + [(getenv) (OpenXM_PSTOIMG_TYPE)] extension +def + /httpd_startserver { [(sm1.socket) (open) [httpd.port (localhost)]] extension /httpd.server.fdAndPort set @@ -70,7 +74,7 @@ httpd_startserver ; httpd_action ; httpd_stopserver ; - (5 sleep) system +% (sleep 2) system httpd.serial 1 add /httpd.serial set } loop } def @@ -89,7 +93,7 @@ 0 sendln () sendln (Shutdown the engine.
) sendln - (See you! Web/sm1 ) sendln + (See you! Web/asir, Web/sm1 ) sendln () sendln 0 sendln [(flush)] extension @@ -123,7 +127,11 @@ %%( ) sendln %%test. It does not work always?! %%( Pretty format ) sendln %%test. It works. - (
) sendln + [(getenv) (OXWEB_POST)] extension tag 0 eq { + () sendln % use get + }{ + () sendln + } ifelse () sendln [()] cat sendln @@ -174,6 +182,17 @@ [(flush)] extension } def +/send-page-warning-image { + (HTTP/0.9 200 OK) sendln + (Connection: close) sendln + (Content-Type: text/html) sendln + 0 sendln + (Error: Image translation is not supported on this server
) sendln + ( Check the value of the environmental variable OpenXM_PSTOIMG_TYPE
) sendln + 0 sendln + [(flush)] extension +} def + /stopclient { [(sm1.socket) (close) [client.fdAndPort 0 get] ] extension message } def @@ -307,25 +326,37 @@ /removeGET { /arg1 set [/in-removeGET /s /s2 /i /j /i0 - /tname + /tname /nnn ] pushVariables [ /s arg1 def /httpd.textarea.valid 1 def s 1 copy /s2 set s (array) dc /s set + /nnn httpd.textarea.name.aaa length 6 sub def /tname [ ] def 0 1 s length 1 sub { /i0 set s i0 get 61 eq { %% 61 is = i0 1 add /i0 set + + [ + << tname length 1 sub >> -1 + << tname length nnn sub >> { + /i set + tname i get + } for + ] reverse /tname set + (GET /?) (array) dc tname join /tname set + tname message httpd.textarea.name.aaa message tname httpd.textarea.name.aaa eq { /httpd.textarea.valid 1 def } { /httpd.textarea.valid 0 def + httpd.textarea.name.aaa { (string) dc } map cat message (Warning: got an invalid name for the text field.) message } ifelse exit @@ -411,10 +442,11 @@ arg1 } def -/executeStringAndSelectInputFromBrowsersAndOxserver { +/executeStringAndSelectInputFromBrowserAndOxserver { + /arg3 set /arg2 set /arg1 set - [/in-executeStringAndSelectInputFromBrowsersAndOxserver + [/in-executeStringAndSelectInputFromBrowserAndOxserver /oxserver.ccc /command.to.oxserver /sss.engine @@ -422,11 +454,13 @@ /sss /err /httpd.result + /stringOrCmo ] pushVariables % Global var: httpd.server.fd [ /oxserver.ccc arg1 def /command.to.oxserver arg2 def + /stringOrCmo arg3 def oxserver.ccc command.to.oxserver oxexecutestring ; @@ -434,7 +468,11 @@ [(oxReq) oxserver.ccc SM_dupErrors ] extension pop [(oxReq) oxserver.ccc SM_popCMO ] extension pop - [(oxReq) oxserver.ccc SM_popString ] extension pop + stringOrCmo (string) eq { + [(oxReq) oxserver.ccc SM_popString ] extension pop + }{ + [(oxReq) oxserver.ccc SM_popCMO ] extension pop + } ifelse [(flush)] extension pop %% Select inputs for interruption. %% Wait by the spin lock. @@ -453,7 +491,6 @@ sss 0 get { [(oxGet) oxserver.ccc] extension /err set [(oxGet) oxserver.ccc] extension /httpd.result set - %% oxserver.ccc oxpopstring /httpd.result set } { oxserver.ccc oxreset oxserver.ccc ("computation is interrupted.";) oxexecutestring ;