===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd.sm1,v
retrieving revision 1.7
retrieving revision 1.12
diff -u -p -r1.7 -r1.12
--- OpenXM/src/kan96xx/Doc/httpd.sm1	2002/10/21 01:59:15	1.7
+++ OpenXM/src/kan96xx/Doc/httpd.sm1	2002/10/30 13:23:06	1.12
@@ -1,11 +1,22 @@
-%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd.sm1,v 1.6 2002/10/17 13:40:28 takayama Exp $
+%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd.sm1,v 1.11 2002/10/29 07:29:23 takayama Exp $
 %% common modules for httpd on sm1.
 /Oxserver_history_variable (Oxserver_history_variable_) def
 /httpd.image.type  
   [(getenv) (OpenXM_PSTOIMG_TYPE)] extension
 def
 
+[(getenv) (OXWEB_DEBUG)] extension tag 0 eq {
+   /httpd.debug 0 def
+} {  
+   /httpd.debug 1 def
+} ifelse
+[(getenv) (OXWEB_TAKE_LOG)] extension tag 0 eq {
+   /httpd.take.log  0 def
+} {  
+   /httpd.take.log 1 def
+} ifelse
 
+
 /httpd_startserver {
    [(sm1.socket) (open) [httpd.port (localhost)]] extension 
    /httpd.server.fdAndPort set
@@ -27,7 +38,7 @@ def
 
 /sendln {
  /arg1 set
- [/in-sendln /mmm] pushVariables
+ [/in-sendln /mmm /i] pushVariables
  [ arg1 /mmm set
   mmm tag 5 eq {
     [mmm 10 (string) dc] cat /mmm set
@@ -37,7 +48,8 @@ def
   [(sm1.socket) (select) [httpd.server.fd 0 get 0]] extension {
     (Warning (sendln): your peer closed the connection. Do not send the data.) message
   } {
-    [(sm1.socket) (write) [httpd.server.fd 0 get mmm]] extension message
+    [(sm1.socket) (write) [httpd.server.fd 0 get mmm]] extension /i set
+     httpd.debug { i message } { } ifelse
   } ifelse
  ] pop
  popVariables
@@ -74,6 +86,7 @@ def
     httpd_startserver ;
     httpd_action ;
     httpd_stopserver ;
+    httpd.take.log { (date) system  } { } ifelse
 %    (sleep 2) system 
     httpd.serial 1 add /httpd.serial set
   } loop    
@@ -288,7 +301,7 @@ def
         ss i (,) put
       } {  } ifelse
     } for
-    ss message
+    httpd.debug { ss message } {  } ifelse
     [ ss to_records pop] /arg1 set
   ] pop
   popVariables
@@ -322,40 +335,58 @@ def
   arg1
 } def
 
-%% remove GET /?msg=
+%% remove GET /?msg= or msg=
 /removeGET {
   /arg1 set
   [/in-removeGET /s /s2 /i /j /i0
-   /tname  /nnn
+   /tname  /nnn /sta
   ] pushVariables
   [
      /s arg1 def
-     /httpd.textarea.valid 1 def
+     /httpd.textarea.valid 0 def
      s 1 copy /s2 set
      s (array) dc /s set
+
+     /sta 0 def
+
+     %% In case of POST, remove the HTTP header. cf. trouble for NS 6.0
+     s length 4 gt {
+       [s 0 get s 1 get s 2 get s 3 get] (POST) (array) dc eq {
+          0 1 s length 4 sub { 
+             /i0 set
+             /sta i0 def
+             [ s i0 get  s i0 1 add get ] [ 10 10 ] eq 
+             [ s i0 get  s i0 1 add get s i0 2 add get s i0 3 add get] 
+             [ 13 10 13 10] eq or
+             { exit } { } ifelse
+          } for
+        }{ } ifelse
+     } { } ifelse
+     (sta=) messagen sta message 
      /nnn httpd.textarea.name.aaa length 6 sub def
 
      /tname  [  ] def
-     0 1 s length 1 sub {
+     sta 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 >> {
+          << tname length nnn sub >> dup 0 ge { } { pop 0 } ifelse 
+          {
              /i set
              tname i get
           } for
-         ] reverse /tname set
+         ] reverse /tname set 
          (GET /?) (array) dc tname join /tname set
 
-         tname message
-         httpd.textarea.name.aaa message
+         httpd.debug { httpd.textarea.name.aaa message } {  } ifelse
          tname httpd.textarea.name.aaa eq {
            /httpd.textarea.valid 1 def
          } {
            /httpd.textarea.valid 0 def
+           tname message 
            httpd.textarea.name.aaa { (string) dc } map cat message
            (Warning: got an invalid name for the text field.) message
          } ifelse
@@ -368,6 +399,8 @@ def
      i0 1 s length 1 sub {
        /i set
        s2 j << s i get (string) dc >> put
+       j s2 length 1 sub lt { s2 j 1 add ( ) put } { } ifelse
+       %% might cause a BUG. It should be improved.
        j 1 add /j set
      } for
      /arg1 s2 def