===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -p -r1.6 -r1.9
--- OpenXM/src/kan96xx/Doc/httpd-asir.sm1 2001/04/22 00:34:01 1.6
+++ OpenXM/src/kan96xx/Doc/httpd-asir.sm1 2001/04/22 04:55:07 1.9
@@ -1,7 +1,8 @@
-%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v 1.5 2001/04/21 13:54:29 takayama Exp $
+%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v 1.8 2001/04/22 04:35:46 takayama Exp $
%% http server by sm1
/httpd.port 1200 def
+
/httpd.initialization
%% Put initialization codes here.
[
@@ -9,6 +10,7 @@
" Risa/Asir oxasir version "+rtostr(version());)
] cat
def
+
[(parse) (oxasir.sm1) pushfile] extension
(oxasir.started) boundp {
} {
@@ -19,10 +21,20 @@ def
} ifelse
/asirweb {
+ [/rrr ] 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
+
[(sleep 3; netscape -geometry 800x500 http://localhost:)
httpd.port toString
( &)] cat system
httpd ;
+ ] pop
+ popVariables
} def
/httpd_startserver {
@@ -94,9 +106,13 @@ def
/httpd.com httpd.initialization def
} { } ifelse
httpd.com metaCommand {
- oxasir.ccc
- [(if (1) {) httpd.com (};)] cat
- oxexecutestring ;
+ httpd.textarea.valid {
+ oxasir.ccc
+ [(if (1) {) httpd.com (; };)] cat
+ oxexecutestring ;
+ }{
+ send-page-warning exit
+ } ifelse
[(oxReq) oxasir.ccc SM_dupErrors ] extension pop
[(oxReq) oxasir.ccc SM_popCMO ] extension pop
@@ -140,6 +156,7 @@ def
(/**** ) httpd.serial toString ( ****/)
10 (string) dc
httpd.com
+ (;) %% add extra ;
] cat
append
def
@@ -153,11 +170,11 @@ def
( asirweb )
( Input-) httpd.serial toString
(: )
- ( ) httpd.com (
) (
)
+ httpd.com preformatHTML (
)
} ifelse
( Output-) httpd.serial toString
(: )
- () httpd.result (
)
+ httpd.result preformatHTML
] cat
send-page-3 exit
} { exit } ifelse %% metaCommand
@@ -214,7 +231,8 @@ def
result sendln
() sendln
send-menu-1
0 sendln
@@ -260,19 +278,16 @@ def
[
(HTTP/0.9 200 OK) sendln
(Connection: close) sendln
- (Content-Type: text/html) sendln
+ (Content-Type: text/plain) sendln
0 sendln
- ( ) sendln
- (/* Saved the following to sm1out.txt */
) sendln
- (/* Save the following by your browser as a text file. */
) sendln
+ (/* Saved the following to sm1out.txt */) sendln
+ (/* Save the following by your browser as a text file. */) sendln
- () sendln
0 1 httpd.history length 1 sub {
/i set
httpd.history i get sendln
} for
- () sendln
- ( ) sendln
+ ( end$) sendln
0 sendln
[(flush)] extension
[(PrintDollar) 1] system_variable
@@ -282,6 +297,15 @@ def
popVariables
} def
+/send-page-warning {
+ (HTTP/0.9 200 OK) sendln
+ (Connection: close) sendln
+ (Content-Type: text/html) sendln
+ 0 sendln
+ (You cannot execute oxasir without a session key!
) sendln
+ 0 sendln
+ [(flush)] extension
+} def
/stopclient {
[(sm1.socket) (close) [client.fdAndPort 0 get] ] extension message
@@ -333,15 +357,67 @@ def
arg1
} def
+/randomName {
+ [/in-randomName /sss /rrr ] pushVariables
+ [
+ %% Seed name
+ /sss [ 97 97 97 97 97 97 97 97 97 97 ] def %% 97 == 'a'
+ %% This procedure to generate port number might fail.
+ sss {
+ [
+ [(oxGenPass)] extension .. /rrr set
+ [(tdiv_qr) rrr (26)..] mpzext 1 get /rrr set
+ ] pop
+ rrr (integer) dc add
+ } map
+ /sss set
+ sss {(string) dc} map cat /arg1 set
+ ] pop
+ popVariables
+ arg1
+} def
+
+(httpd.textarea.name) boundp { }
+ {
+ /httpd.textarea.name randomName def
+ /httpd.textarea.name.aaa
+ [(GET /?) httpd.textarea.name] cat
+ (array) dc
+ def
+ } ifelse
+
+%% remove GET /?msg=
/removeGET {
/arg1 set
- [/in-removeGET /s /s2 /i /j] pushVariables
+ [/in-removeGET /s /s2 /i /j /i0
+ /tname
+ ] pushVariables
[
/s arg1 def
+ /httpd.textarea.valid 1 def
s 1 copy /s2 set
s (array) dc /s set
+
+ /tname [ ] def
+ 0 1 s length 1 sub {
+ /i0 set
+ s i0 get 61 eq { %% 61 is =
+ i0 1 add /i0 set
+ tname message
+ httpd.textarea.name.aaa message
+ tname httpd.textarea.name.aaa eq {
+ /httpd.textarea.valid 1 def
+ } {
+ /httpd.textarea.valid 0 def
+ (Warning: got an invalid name for the text field.) message
+ } ifelse
+ exit
+ } { } ifelse
+ tname s i0 get append /tname set
+ } for
+
/j 0 def
- 10 1 s length 1 sub {
+ i0 1 s length 1 sub {
/i set
s2 j << s i get (string) dc >> put
j 1 add /j set
@@ -391,6 +467,33 @@ def
arg1
} def
+/preformatHTML {
+ /arg1 set
+ [/in-preformatHTML /sss /c] pushVariables
+ [
+ /sss arg1 def
+ sss (array) dc /sss set
+ sss {
+ /c set
+ [
+ c 60 eq {
+ /c (<) def
+ } { } ifelse
+ c 62 eq {
+ /c (>) def
+ } { } ifelse
+ c 38 eq {
+ /c (&) def
+ } { } ifelse
+ ] pop
+ c (string) dc
+ } map cat /sss set
+ [( ) sss (
)] cat /arg1 set
+ ] pop
+ popVariables
+ arg1
+} def
+
/metaCommand {
/arg1 set
[/in-metaCommand /msg /result] pushVariables
@@ -398,6 +501,7 @@ def
/msg arg1 def
/result 1 def
msg (httpdAsirMeta quit) eq {
+ oxasir.ccc oxshutdown
send-page-bye
quit
/result 0 def