===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/cgi.sm1,v
retrieving revision 1.13
retrieving revision 1.18
diff -u -p -r1.13 -r1.18
--- OpenXM/src/kan96xx/Doc/cgi.sm1	2013/09/22 01:07:38	1.13
+++ OpenXM/src/kan96xx/Doc/cgi.sm1	2020/03/12 07:33:03	1.18
@@ -1,4 +1,4 @@
-% $OpenXM: OpenXM/src/kan96xx/Doc/cgi.sm1,v 1.12 2004/12/29 01:42:13 takayama Exp $
+% $OpenXM: OpenXM/src/kan96xx/Doc/cgi.sm1,v 1.17 2013/10/11 01:08:35 takayama Exp $
 %  OpenXM/src/polymake/cgi/cgi-polymake.sh
 %   is a shell script to call sm1/polymake as a CGI script.
 %  Override as /doPolymake {doPolymake.OoHG} def if you need.
@@ -231,8 +231,61 @@ def
 % ------------  client side script ---------------
 /cgiQueryPolymake.hostname (polymake.math.kobe-u.ac.jp) def
 /cgiQueryPolymake.cginame (/cgi-bin/cgi-polymake.sh) def
-/cgiQueryPolymake {
+%This host and cgi are version 2.0 polymake.  dim, ... are different with new versions.
+/cgiQueryPolymake { cgiQueryPolymake.curl } def
+%/cgiQueryPolymake { cgiQueryPolymake.native } def
+/cgiQueryPolymake.curl {
   /arg2 set /arg1 set
+  [/saction /sfile /ff /ff1 /sss2 /goo /pp /pp2 /key /body /fd /pid] pushVariables
+  [
+    /saction arg1 def /sfile arg2 def
+% step1. Generate query in URL encoding.
+     [(http://) cgiQueryPolymake.hostname cgiQueryPolymake.cginame] cat
+     /ff1 set
+% full URL necessary for virtual host of apache.
+     [[(oxMessageBody)
+       [saction ( )
+        sfile nl ] cat
+       ]
+     ] /ff set
+
+     ff 0 get 0 get /key set
+     ff 0 get 1 get /body set
+
+     /pid [(getpid)] extension toString def
+
+% step 2. Call the server and get the response in pp  
+     /cgi.verbose 1 def
+     [(/tmp/sm1-q-cgi.txt) pid] cat (w) file /fd set
+     fd body writestring
+     fd closefile
+
+%     [(curl) (--form) [key (=@/tmp/sm1-q-cgi.txt)] cat  ff1] /ff set
+%     ff  addStdoutStderr oxshell  @@@stdout /pp set
+     [(curl  --form ) [key (=@/tmp/sm1-q-cgi.txt) pid ( )] cat  ff1 (>/tmp/sm1-q-cgi-out.txt) pid] cat /ff set
+     ff system 
+     [nl [(/tmp/sm1-q-cgi-out.txt) pid] cat pushfile] cat /pp set
+
+%% Store workfiles under OpenXM_tmp
+     [(mkdir -p ) [(getenv) (OpenXM_tmp)] extension] cat system
+     [(mv /tmp/sm1-q-cgi.txt) pid ( ) [(getenv) (OpenXM_tmp)] extension] cat system
+     [(mv /tmp/sm1-q-cgi-out.txt) pid ( ) [(getenv) (OpenXM_tmp)] extension] cat system
+
+     cgi.verbose { pp message } {  } ifelse
+     [(cgiHttpToKeyValuePair) pp] extension /pp2 set
+     pp2 message
+% step 3. Analyze the response.
+     [pp2 (Content-Body) getNode
+      pp2 (oxshell-stdout) getNode
+      pp2 (oxshell-stderr) getNode 
+     ] /arg1 set
+  ] pop
+  popVariables
+  arg1
+} def
+
+/cgiQueryPolymake.native {
+  /arg2 set /arg1 set
   [/saction /sfile /ff /ff1 /sss2 /goo /pp /pp2] pushVariables
   [
     /saction arg1 def /sfile arg2 def
@@ -294,10 +347,15 @@ def
 %/polymake.start { polymake.start.OoHG } def
 
 [(doPolymake.OoHG)
-[(It first looks for local polymake. If there is, it calls the local polymake.)
- (If not, it calls http://polymake.math.kobe-u.ac.jp/cgi-bin/cgi-polymake.sh)
+[(doPolymake.local calls the local polymake.)
+ (This function calls http://polymake.math.kobe-u.ac.jp/cgi-bin/cgi-polymake.sh)
  (to make a computation in polymake.)
+ (The host name and the cgi name are set to the variable)
+ (   cgiQueryPolymake.hostname  and cgiQueryPolymake.cginame)
  (See doPolymake for the syntax. doPolymake.OoHG may overrides doPolymake.)
+ (If you use curl to call the server execute) 
+ (   usePolymake.OoHG.curl)
+ (after loading cgi.sm1) 
 ]] putUsages
 /doPolymake.OoHG  {
   /arg1 set
@@ -307,7 +365,7 @@ def
   [
     arg1 0 get /pAction set
     arg1 1 get /pData set
-    polymake.start
+    polymake.start.OoHG
 
     /pError [ ] def
 %% step 1:  polymake tfb ===> polymake native data
@@ -324,7 +382,7 @@ def
 % cgi-polymake
        (Trying web service.) message
        pAction pNative  cgiQueryPolymake /doPolymake.OoHG.result set
-
+       doPolymake.OoHG.result /@@@doPolymake.vars set
       [(regexec) (Not Found) [doPolymake.OoHG.result 0 get ]] 
       extension length 0 eq not {
          doPolymake.OoHG.result message
@@ -374,6 +432,50 @@ def
      (polymake2tfb is not installed in this system.) error
   } {  } ifelse
 } def
+
+
+/usePolymake.local {
+  /doPolymake { doPolymake.local } def
+  /polymake.start { polymake.start.local } def
+} def
+
+/usePolymake.OoHG.native {
+  /doPolymake { doPolymake.OoHG } def
+  /polymake.start { polymake.start.OoHG } def
+  /cgiQueryPolymake { cgiQueryPolymake.native } def
+} def
+
+/usePolymake.OoHG.curl {
+  [(which) (curl)] oxshell tag 0 eq {
+     (Error in usePolymake.OoHG.curl: curl is not found.) error
+  } { } ifelse
+  /doPolymake { doPolymake.OoHG } def
+  /polymake.start { polymake.start.OoHG } def
+  /cgiQueryPolymake { cgiQueryPolymake.curl } def
+} def
+
+[(usePolymake.local)
+[(doPolymake calls local polymake) 
+]] putUsages
+
+[(usePolymake.OoHG.native)
+[(doPolymake = doPolymake.OoHG with cgiQueryPolymake.native)
+ (cf. doPolymake.OoHG)
+ (hostname is set in cgiQueryPolymake.hostname)
+ (cginame is set in  cgiQueryPolymake.cginame)
+]] putUsages
+
+[(usePolymake.OoHG.curl)
+[(doPolymake = doPolymake.OoHG with cgiQueryPolymake.curl)
+ (It should be used when cgiQueryPolymake.native does not work)
+ (over, e.g., a reverse proxy.)
+ (The command curl is required.  cf. cgi.verbose, doPolymake.OoHG)
+ (hostname is set in cgiQueryPolymake.hostname)
+ (cginame is set in  cgiQueryPolymake.cginame)
+]] putUsages
+
+
+
 
 
  
\ No newline at end of file