[Aimmath-commit] AIM/WEB-INF/maple Console.mpl,1.5,1.6 Make.mpl,1.3,1.4

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

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

Modified Files:
	Console.mpl Make.mpl 
Log Message:
Various minor improvements

Index: Console.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Console.mpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Console.mpl	19 Sep 2003 04:08:00 -0000	1.5
--- Console.mpl	10 Mar 2004 02:06:53 -0000	1.6
***************
*** 23,40 ****
  
  killserver := proc()
!  local command;
!  command :=
!   cat(
!    "ps -auxwww | ",
!    "grep \"cmaple.*-q\" | ",
!    "grep -v grep | ",
!    "awk '{print $2}' | ",
!    "xargs kill 2> /dev/null");
  
!  system(command);
  end:
  
! stopaim := proc() system("/aim/WEB-INF/stopaim.sh"); end:
! startaim := proc() system("/aim/WEB-INF/startaim.sh"); end:
  
  ######################################################################
--- 23,40 ----
  
  killserver := proc()
! #   local command;
! #   command :=
! #    cat(
! #     "ps -auxwww | ",
! #     "grep \"cmaple.*-q\" | ",
! #     "grep -v grep | ",
! #     "awk '{print $2}' | ",
! #     "xargs kill 2> /dev/null");
  
! #   system(command);
  end:
  
! #stopaim := proc() system("/aim/WEB-INF/stopaim.sh"); end:
! #startaim := proc() system("/aim/WEB-INF/startaim.sh"); end:
  
  ######################################################################
***************
*** 44,48 ****
  
  mktags := proc()
!  system("/usr/local/aim/maple/tools/mktags");
  end:
  
--- 44,48 ----
  
  mktags := proc()
! # system("/usr/local/aim/maple/tools/mktags");
  end:
  
***************
*** 57,61 ****
   read("Make.mpl");
   if nargs = 0 then 
!   killserver();
   fi;
  end:
--- 57,61 ----
   read("Make.mpl");
   if nargs = 0 then 
! #  killserver();
   fi;
  end:
***************
*** 459,460 ****
--- 459,469 ----
    fi:
  end:
+ 
+ TrySyntax := 
+  proc(rawans::string)
+   local attempt;
+   attempt := `new/aim/Question/Attempt`(rawans);
+   `aim/TextQuestion/BasicValidation`(attempt);
+   return(attempt['ValidationMessage']);
+  end:
+ 

Index: Make.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Make.mpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Make.mpl	25 Aug 2003 21:47:18 -0000	1.3
--- Make.mpl	10 Mar 2004 02:06:53 -0000	1.4
***************
*** 150,166 ****
  
  if MakeTrans = true then
!  `Package/TranslationStrings` := 
!   sort(`Package/TranslationStrings`,
!        (x,y) -> (op(1,x) < op(1,y))):
   transfile := cat(Config['DocDir'],"/trans.mpl"):
   traperror(fclose(transfile)):
   fd := fopen(transfile,WRITE):
!  for x in `Package/TranslationStrings` do
!   if type([x],[list]) and nops(x) > 2 then
!    fprintf(fd,"# Package: %s\n# Object: %s\n# __(%a) = \"\":\n\n",x[2],x[3],x[1]):
!   fi:
   od:
   fclose(transfile):
!  unassign('transfile','x','fd'):
  fi:
  
--- 150,169 ----
  
  if MakeTrans = true then
!  stringlist := map(x -> x[1],`Package/TranslationStrings`):
!  stringlist := sort([op({op(stringlist)})]):
   transfile := cat(Config['DocDir'],"/trans.mpl"):
   traperror(fclose(transfile)):
   fd := fopen(transfile,WRITE):
!  for x in stringlist do
!   placelist := select((a,b) -> a[1] = b,stringlist,x):
!   for y in placelist do 
!    if type([y],[list]) and nops(y) > 2 then
!     fprintf(fd,"# Package: %s\n# Object: %s\n",y[2],y[3]):
!    fi:
!   od:
!   fprintf(fd,"__(%a) := \n %a:\n\n",x[1],__(x[1])):
   od:
   fclose(transfile):
!  unassign('transfile','stringlist','placelist','x','y','fd'):
  fi: