[Aimmath-commit] AIM/WEB-INF/maple AliceServer.mpl,1.5,1.6 ImageCache.mpl,1.4,1.5

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

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

Modified Files:
	AliceServer.mpl ImageCache.mpl 
Log Message:
Changes to location of image cache to avoid problem of vanishing images.

Index: AliceServer.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/AliceServer.mpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AliceServer.mpl	12 Sep 2003 03:16:46 -0000	1.5
--- AliceServer.mpl	10 Mar 2004 01:34:41 -0000	1.6
***************
*** 58,69 ****
  # (See ImageCache.mpl for explanation.)
  if not(assigned(AimImageCache)) then
   AimImageCache :=
!   eval(`new/ImageCache`(cat(Config['WebDir'],"/imagecache"),
!                         cat(Config['DocumentURL'],"/imagecache"))):
  fi:
  
  # Set up a cache for storing quiz versions
  if not(assigned(AimQuizCache)) then
!  AimQuizCache := `new/aim/QuizCache`();
  fi:
  
--- 58,77 ----
  # (See ImageCache.mpl for explanation.)
  if not(assigned(AimImageCache)) then
+  if type([ProcessID],[integer]) then
+   dir := sprintf("%s/imagecache/%d",Config['WebDir'],ProcessID):
+   `OS/MakeDirectory`(dir):
+   url := sprintf("%s/imagecache/%d",Config['DocumentURL'],ProcessID):
+  else
+   dir := sprintf("%s/imagecache",Config['WebDir']):
+   url := sprintf("%s/imagecache",Config['DocumentURL']):
+  fi;
   AimImageCache :=
!   eval(`new/ImageCache`(dir,url)):
!  unassign('dir','url'):
  fi:
  
  # Set up a cache for storing quiz versions
  if not(assigned(AimQuizCache)) then
!  AimQuizCache := `new/aim/QuizCache`():
  fi:
  
***************
*** 104,109 ****
  shutdown := 
   proc()
!   AimImageCache['CleanAll'];
!   quit;
   end:
  
--- 112,122 ----
  shutdown := 
   proc()
!   local dir;
!   AimImageCache['CleanAll']:
!   if type([ProcessID],[integer]) then
!    dir := sprintf("%s/imagecache/%d",Config['WebDir'],ProcessID):
!    `OS/RemoveDirectory`(dir):
!   fi:
!   quit:
   end:
  

Index: ImageCache.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/ImageCache.mpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ImageCache.mpl	25 Sep 2003 19:01:15 -0000	1.4
--- ImageCache.mpl	10 Mar 2004 01:34:58 -0000	1.5
***************
*** 146,150 ****
     err := traperror(open(f,'WRITE'));
     if (err = lasterror) then
!     ERROR(sprintf("Error reading image count file %A:\n%A\n\n",f,err));
     fi;
     err := traperror(fprintf(f,"%d\n",c));
--- 146,150 ----
     err := traperror(open(f,'WRITE'));
     if (err = lasterror) then
!     ERROR(sprintf("Error opening image count file %A:\n%A\n\n",f,err));
     fi;
     err := traperror(fprintf(f,"%d\n",c));
***************
*** 238,241 ****
--- 238,242 ----
    proc(this,x::`ImageCache/Plot`)
     local c,file,url;
+    global Config;
     c := this['NextCount'];
     file := sprintf("%s/%d.%s",this['Dir'],c,Config['ImageFormat']);