--- loncom/xml/lonxml.pm	2002/12/09 22:40:18	1.220
+++ loncom/xml/lonxml.pm	2003/02/12 22:45:01	1.231
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.220 2002/12/09 22:40:18 albertel Exp $
+# $Id: lonxml.pm,v 1.231 2003/02/12 22:45:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,7 +41,6 @@
 # 6/1/1 Gerd Kortemeyer
 # 2/21,3/13 Guy
 # 3/29,5/4 Gerd Kortemeyer
-# 5/10 Scott Harrison
 # 5/26 Gerd Kortemeyer
 # 5/27 H. K. Ng
 # 6/2,6/3,6/8,6/9 Gerd Kortemeyer
@@ -146,7 +145,7 @@ $Apache::lonxml::registered=0;
 $Apache::lonxml::request='';
 
 # a problem number counter, and check on ether it is used
-$Apache::lonxml::counter=1;
+$Apache::lonxml::counter=4;
 $Apache::lonxml::counter_changed=0;
 
 #internal check on whether to look at style defs
@@ -192,7 +191,8 @@ sub xmlend {
               my $idx;
               for ($idx=1;$idx<=$contrib{'version'};$idx++) {
 		my $hidden=($contrib{'hidden'}=~/\.$idx\./);
-		unless (($hidden) && (!$seeid)) {
+		my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+		unless ((($hidden) && (!$seeid)) || ($deleted)) {
                  my $message=$contrib{$idx.':message'};
                  $message=~s/\n/\<br \/\>/g;
 		 $message=&Apache::lontexconvert::msgtexconverted($message);
@@ -226,8 +226,10 @@ sub xmlend {
                           } else {
                              $sender.=' <a href="/adm/feedback?hide='.
 				 $symb.':::'.$idx.'">Hide</a>';
-			  }
-                      }                   
+			  }                     
+                          $sender.=' <a href="/adm/feedback?deldisc='.
+				 $symb.':::'.$idx.'">Delete</a>';
+                      }
                   } else {
                       if ($screenname) {
 			  $sender='<i>'.$screenname.'</i>';
@@ -268,7 +270,7 @@ sub tokeninputfield {
     my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
     $defhost=~tr/a-z/A-Z/;
     return (<<ENDINPUTFIELD)
-<script>
+<script type="text/javascript">
     function updatetoken() {
 	var comp=new Array;
         var barcode=unescape(document.tokeninput.barcode.value);
@@ -352,7 +354,7 @@ sub printtokenheader {
     if ($target eq 'web') {
         my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
 	return 
- '<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'.
+ '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
                'Checked out for '.$plainname.
                '<br />User: '.$tuname.' at '.$tudom.
 	       '<br />ID: '.$idhash{$tuname}.
@@ -392,7 +394,7 @@ sub registerurl {
     my $result = '';
     
     if ($target eq 'edit') {
-        $result .="<script>\n".
+        $result .="<script type=\"text/javascrtipt\">\n".
             "if (typeof menu != 'undefined') {menu.currentURL=null;}\n".
             &Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";
@@ -401,12 +403,11 @@ sub registerurl {
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg)) {
 	return $result.
-         '<script>function LONCAPAreg(){} function LONCAPAstale(){}</script>';
+         '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
     }
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $Apache::lonxml::registered=1;
-    my $nothing='';
-    if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+    my $reopen=&Apache::lonmenu::reopenmenu();
     my $newmail='';
     if (&Apache::lonmsg::newmail()) { 
        $newmail='menu.setstatus("you have","messages");';
@@ -496,7 +497,7 @@ ENDPARM
 // BEGIN LON-CAPA Internal
 
     function LONCAPAreg() {
-	  menu=window.open("$nothing","LONCAPAmenu","",false);
+	  menu=$reopen;
           menu.clearTimeout(menu.menucltim);
           $timesync
           $newmail
@@ -507,7 +508,7 @@ ENDPARM
           menu.currentStale=0;
           menu.clearbut(3,1);
           menu.switchbutton
-       (6,3,'catalog.gif','catalog','info','catalog_info()');
+       (6,3,'catalog.gif','catalog','info','catalog_info()','Show catalog information');
           menu.switchbutton
        (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
           menu.switchbutton
@@ -529,7 +530,7 @@ ENDPARM
     }
 
     function LONCAPAstale() {
-	  menu=window.open("$nothing","LONCAPAmenu","",false);
+	  menu=$reopen
           menu.currentStale=1;
           if (menu.reloadURL!='' && menu.reloadURL!= null) { 
              menu.switchbutton
@@ -556,7 +557,7 @@ ENDREGTHIS
 // BEGIN LON-CAPA Internal
 
     function LONCAPAreg() {
-	  menu=window.open("$nothing","LONCAPAmenu","",false);
+	  menu=$reopen
           $timesync
           menu.currentStale=1;
           menu.clearbut(2,1);
@@ -667,18 +668,24 @@ sub htmlclean {
 }
 
 sub latex_special_symbols {
-    my ($current_token,$stack,$parstack)=@_;
-    $current_token=~s/\\ /\\char92 /g;
-    $current_token=~s/\^/\\char94 /g;
-    $current_token=~s/\~/\\char126 /g;
-    $current_token=~s/(&[^a-z\#])/\\$1/g;
-    $current_token=~s/([^&])\#/$1\\#/g;
-    $current_token=~s/(\$|_|{|})/\\$1/g;
-    $current_token=~s/\\char92 /\\texttt{\\char92}/g;
-    $current_token=~s/>/\$>\$/g; #more
-    $current_token=~s/</\$<\$/g; #less
-    if ($current_token=~m/\d%/) {$current_token =~ s/(\d)%/$1\\%/g;} #percent after digit
-    if ($current_token=~m/\s%/) {$current_token =~ s/(\s)%/$1\\%/g;} #persent after space
+    my ($current_token,$stack,$parstack,$where)=@_;
+    if ($where=='header') {
+      $current_token =~ s/_/ /g;
+      $current_token =~ s/\^/ /g;
+      $current_token =~ s/&/\\&/g;
+    } else {
+     $current_token=~s/\\ /\\char92 /g;
+     $current_token=~s/\^/\\char94 /g;
+     $current_token=~s/\~/\\char126 /g;
+     $current_token=~s/(&[^a-z\#])/\\$1/g;
+     $current_token=~s/([^&])\#/$1\\#/g;
+     $current_token=~s/(\$|_|{|})/\\$1/g;
+     $current_token=~s/\\char92 /\\texttt{\\char92}/g;
+     $current_token=~s/>/\$>\$/g; #more
+     $current_token=~s/</\$<\$/g; #less
+     if ($current_token=~m/\d%/) {$current_token =~ s/(\d)%/$1\\%/g;} #percent after digit
+     if ($current_token=~m/\s%/) {$current_token =~ s/(\s)%/$1\\%/g;} #persent after space
+    }
     return $current_token;
 }
 
@@ -771,7 +778,7 @@ sub inner_xmlparse {
       if ($token->[0] eq 'E') { 
 	&end_tag($stack,$parstack,$token);
       }
-    }
+    }	
     if ($#$pars > -1) {
 	pop @$pars;
 	pop @Apache::lonxml::pwd;
@@ -1113,7 +1120,9 @@ sub store_counter {
 sub get_all_text {
  my($tag,$pars)= @_;
  &Apache::lonxml::debug("Got a ".ref($pars));
+ my $gotfullstack=1;
  if (ref($pars) ne 'ARRAY') {
+     $gotfullstack=0;
      $pars=[$pars];
  }
  my $depth=0;
@@ -1122,7 +1131,8 @@ sub get_all_text {
  if ( $tag =~ m:^/: ) { 
    my $tag=substr($tag,1); 
    #&Apache::lonxml::debug("have:$tag:");
-   while (($depth >=0) && ($#$pars > -1)) {
+   my $top_empty=0;
+   while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
      while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
        #&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
        if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
@@ -1140,11 +1150,21 @@ sub get_all_text {
 	 }
        }
      }
+     if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
      if (($depth >=0) && ($#$pars > 0) ) {
        pop(@$pars);
        pop(@Apache::lonxml::pwd);
      }
    }
+   if ($top_empty && $depth >= 0) {
+       #never found the end tag ran out of text, throw error send back blank
+       &error('Never found end tag for &lt;'.$tag.'&gt;');
+       if ($gotfullstack) {
+	   my $newstring='</'.$tag.'>'.$result;
+	   &Apache::lonxml::newparser($pars,\$newstring);
+       }
+       $result='';
+   }
  } else {
      while ($#$pars > -1) {
 	 while ($token = $$pars[-1]->get_token) {
@@ -1196,7 +1216,7 @@ sub parstring {
   foreach (@{$token->[3]}) {
     unless ($_=~/\W/) {
       my $val=$token->[2]->{$_};
-      $val =~ s/([\%\@\\\"])/\\$1/g;
+      $val =~ s/([\%\@\\\"\'])/\\$1/g;
       #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
       $temp .= "my \$$_=\"$val\";"
     }
@@ -1250,7 +1270,7 @@ sub afterburn {
         $matchthis=~s/\_+/\\s\+/g;
         $result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
         $result.=(<<"ENDSCRIPT");
-<script>
+<script type="text/javascript">
     document.location.hash='$anchorname';
 </script>
 ENDSCRIPT
@@ -1486,14 +1506,22 @@ sub get_param_var {
   if ( ! $context ) { $context = -1; }
   my $args ='';
   if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+  &Apache::lonxml::debug("Args are $args param is $param");
   if ($case_insensitive) {
       if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {
 	  return undef;
       }
   } elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; }
   my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
-  if ($value =~ /^[\$\@\%]/) {
-    return &Apache::run::run("return $value",$safeeval,1);
+  &Apache::lonxml::debug("first run is $value");
+  if ($value =~ /^[\$\@\%]\w+$/) {
+      &Apache::lonxml::debug("doing second");
+      my @result=&Apache::run::run("return $value",$safeeval,1);
+      if (!defined($result[0])) {
+	  return $value
+      } else {
+	  if (wantarray) { return @result; } else { return $result[0]; }
+      }
   } else {
     return $value;
   }