[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[www]

www		Tue Feb 18 16:14:16 2003 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Respects the "suppress" settings and calls routine in lonmeta to construct
  an alt-tag if none is given. There is something fishy here, though: uncomment
  the "use Apache::lonmeta" line, and this blows up.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.115 loncom/xml/londefdef.pm:1.116
--- loncom/xml/londefdef.pm:1.115	Mon Feb 17 12:34:16 2003
+++ loncom/xml/londefdef.pm	Tue Feb 18 16:14:16 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.115 2003/02/17 17:34:16 www Exp $
+# $Id: londefdef.pm,v 1.116 2003/02/18 21:14:16 www Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -50,6 +50,7 @@
 use Apache::File();
 use Image::Magick;
 use Apache::lonmenu;
+#use Apache::lonmeta;
 
 BEGIN {
 
@@ -1598,7 +1599,15 @@
 	    my $scaling = .3;
 
 	    if ($target eq 'web') {
-              $currentstring = $token->[4];
+              if ($ENV{'browser.imagesuppress'} ne 'on') {
+                 $currentstring = $token->[4];
+	      } else {
+		  my $alttag=$token->[2]->{'alt'};
+                  unless ($alttag) {
+                     $alttag=&Apache::lonmeta::alttag($token->[2]->{'src'});
+                  }
+                  $currentstring='[IMAGE: '.$alttag.']';
+	      }
 	    } elsif ($target eq 'tex') {
 	      &image_replication($src);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
@@ -1691,7 +1700,15 @@
                                         $token->[2]->{'archive'};
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];
+              if ($ENV{'browser.appletsuppress'} ne 'on') {
+                 $currentstring = $token->[4];
+	      } else {
+		  my $alttag=$token->[2]->{'alt'};
+                  unless ($alttag) {
+                     $alttag=&Apache::lonmeta::alttag($token->[2]->{'code'});
+                  }
+                  $currentstring='[APPLET: '.$alttag.']';
+	      }
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\begin{figure} ";
 	    } 
@@ -1716,7 +1733,15 @@
 	$token->[2]->{'src'};
     my $currentstring = '';
     if ($target eq 'web') {
-	$currentstring = $token->[4];
+       if ($ENV{'browser.embedsuppress'} ne 'on') {
+          $currentstring = $token->[4];
+       } else {
+	  my $alttag=$token->[2]->{'alt'};
+          unless ($alttag) {
+             $alttag=&Apache::lonmeta::alttag($token->[2]->{'src'});
+          }
+          $currentstring='[EMBED: '.$alttag.']';
+      }
     } elsif ($target eq 'tex') {
 	$currentstring = " \\begin{figure} ";  
     }