[LON-CAPA-cvs] cvs: loncom /homework randomlabel.pm

[sakharuk]

sakharuk		Tue Oct 22 17:25:34 2002 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  Fixed bug where list environment was in conflict with picture environment.
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.37 loncom/homework/randomlabel.pm:1.38
--- loncom/homework/randomlabel.pm:1.37	Mon Oct 14 16:37:27 2002
+++ loncom/homework/randomlabel.pm	Tue Oct 22 17:25:34 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.37 2002/10/14 20:37:27 albertel Exp $
+# $Id: randomlabel.pm,v 1.38 2002/10/22 21:25:34 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,6 +61,7 @@
 use strict;
 use Apache::edit;
 use Apache::File();
+use Apache::Constants qw(:common :http);
 
 BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
@@ -115,14 +116,13 @@
 	$bgimg=~s/\/$//;
         #if no eps file try to replicate it
 	if (not-e $bgimg) {
-	    my $response = &Apache::lonnet::repcopy($bgimg);
-            #if replication failed try to find ps file
-	    if (not-e $bgimg) {
+	    if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
+		#if replication failed try to find ps file
 		$bgimg=~s/\.eps$/\.ps/;
 		#if no ps file try to replicate it
-		if (not-e $bgimg) {
-		    $response = &Apache::lonnet::repcopy($bgimg);
-		    #if replication failed try to produce eps file dynamically
+		if (not-e $bgimg &&
+		    &Apache::lonnet::repcopy($bgimg) ne OK) {
+                    #if replication failed try to produce eps file dynamically
 		    $bgimg=~s/\.ps$/\.eps/;
 		    my $temp_file;
 		    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
@@ -179,7 +179,7 @@
     if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
     $result .= "</applet>\n<BR />";
   } elsif ($target eq 'tex') {
-      $result='\end{picture}\\\\}';
+      $result='\end{picture}\\\\';
 	  @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
       my $one=$1;
 	  @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
@@ -187,7 +187,7 @@
 	  @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
       my $three=$1;
       my $howtoskipback = $three*$one/$two;
-      $result.=' \vskip -'.$howtoskipback.' mm ';
+      $result.=' \vskip -'.$howtoskipback.' mm }';
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;
   }