[Aimmath-commit] AIM/WEB-INF/maple Aim.mpl,1.6.2.3,1.6.2.4 Make.mpl,1.4.2.2,1.4.2.3 rqp.wsdl,1.1.2.3,1.1.2.4

[Neil S. <nps...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6326/maple

Modified Files:
      Tag: aim-xml
	Aim.mpl Make.mpl rqp.wsdl 
Log Message:


Index: Aim.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Aim.mpl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** Aim.mpl	31 Mar 2005 12:37:52 -0000	1.6.2.3
--- Aim.mpl	25 Apr 2005 22:36:35 -0000	1.6.2.4
***************
*** 28,33 ****
   ",
   proc()
!   local f,param,require,command,commandprocedure,starttime,endtime,
!  subjname,subj,id,password,auth,html,extranames,now;
    global Config,DefaultZone,`aim/AssignedNames`,AimCache,AimImageCache;
  
--- 28,33 ----
   ",
   proc()
!   local param,require,command,commandprocedure,starttime,endtime,
!     subjname,subj,id,password,auth,html,extranames,now,i,XMLtext,r;
    global Config,DefaultZone,`aim/AssignedNames`,AimCache,AimImageCache;
  
***************
*** 42,60 ****
    fi;
  
- 
    # convert the arguments to a maple table, stored in the variable
    # param.  This table is passed down to the procedures that do all
    # the real work.
! 
!   f := proc(e)
!         if type([e],[string = string]) then
!          RETURN(lhs(e) = `Util/Unixify`(rhs(e)));
!         else
!          RETURN();
!         fi;
!        end;
! 
!   try 
!    param := table(map(f,[args]));
    catch:
     error(__("Cannot interpret parameters"));
--- 42,58 ----
    fi;
  
    # convert the arguments to a maple table, stored in the variable
    # param.  This table is passed down to the procedures that do all
    # the real work.
!   try
!    param := table([]);
!    i := 1;
!    while i+1 <= nargs do
!     if not(type([args[i..i+1]],[string,string])) then
!      error(__("Non-string arguments"));
!     fi;
!     param[args[i]] := `Util/Unixify`(args[i+1]);
!     i := i+2;
!    od;
    catch:
     error(__("Cannot interpret parameters"));
***************
*** 72,75 ****
--- 70,82 ----
    fi;
  
+   if (param["Command"] = "SOAP") then
+    XMLtext := param["XMLtext"];
+    if not(type([XMLtext],[string])) then
+     error(__("No XML text for SOAP command"));
+    fi;
+    r := eval(`aim/RPC/Service`['Process',XMLtext]);
+    return(r['ToString']);
+   fi;
+ 
    # Define a convenience function to access the parameter table
    require := proc(tbl,key)
***************
*** 141,145 ****
  #         endtime-starttime,`Date/CurrentRawDate`() - now);
  
!   printf("%s",html);
   end
  ):
--- 148,152 ----
  #         endtime-starttime,`Date/CurrentRawDate`() - now);
  
!   return(html);
   end
  ):
***************
*** 179,190 ****
  ]):
  
- `Package/Assign`(
- `aim/AdminCommands`::list(string),
-  "The list of commands that require administrator-level authentication.
-  ",
-  []
-  # This list is filled in when the various aim/admin/*.mpl files
-  # are read.
- ):
  
  
--- 186,189 ----

Index: Make.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Make.mpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -d -r1.4.2.2 -r1.4.2.3
*** Make.mpl	31 Mar 2005 12:37:53 -0000	1.4.2.2
--- Make.mpl	25 Apr 2005 22:36:46 -0000	1.4.2.3
***************
*** 91,101 ****
  kernelopts(printbytes = false):
  
- # KM
- # DIST pread("Package.mpl"):
  if `Package/IsLoaded` <> true then
   pread("FullPackage.mpl"):
   `Package/IsLoaded` := true:
  fi:
- # END KM
  
  if MakeTrans = true then
--- 91,98 ----
***************
*** 116,119 ****
--- 113,117 ----
   fi;
   line := readline("PackageList"):
+ 
  od:
  
***************
*** 128,131 ****
--- 126,130 ----
  # sensible error message for this eventuality.
  
+ 
  save(
   `aim/AdminCommands`,
***************
*** 135,140 ****
  ######################################################################
  
- pread("Aim.mpl"):
- 
  if (MakingDist <> true) then
   pread("AliceServer.mpl"):
--- 134,137 ----

Index: rqp.wsdl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Attic/rqp.wsdl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** rqp.wsdl	21 Apr 2005 10:09:09 -0000	1.1.2.3
--- rqp.wsdl	25 Apr 2005 22:36:46 -0000	1.1.2.4
***************
*** 120,124 ****
  
   <!-- ServerInformation operation -->
!  <message name="ServerInformation" />
   <message name="ServerInformationResponse">
    <part name="identifier" type="xs:anyURI" />
--- 120,126 ----
  
   <!-- ServerInformation operation -->
!  <message name="ServerInformation">
!   <part name="foo" type="xs:string"/>
!  </message> 
   <message name="ServerInformationResponse">
    <part name="identifier" type="xs:anyURI" />