--- loncom/xml/lonxml.pm	2002/10/03 13:34:10	1.197
+++ loncom/xml/lonxml.pm	2002/10/21 17:10:35	1.206
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.197 2002/10/03 13:34:10 sakharuk Exp $
+# $Id: lonxml.pm,v 1.206 2002/10/21 17:10:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@
 
 package Apache::lonxml; 
 use vars 
-qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $prevent_entity_encode);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $prevent_entity_encode $errorcount $warningcount);
 use strict;
 use HTML::LCParser();
 use HTML::TreeBuilder();
@@ -99,11 +99,17 @@ use Apache::edit();
 use Apache::lonnet();
 use Apache::File();
 use Apache::loncommon();
+use Apache::lonfeedback();
+use Apache::lonmsg();
 
 #==================================================   Main subroutine: xmlparse  
 #debugging control, to turn on debugging modify the correct handler
 $Apache::lonxml::debug=0;
 
+# keeps count of the number of warnings and errors generated in a parse
+$warningcount=0;
+$errorcount=0;
+
 #path to the directory containing the file currently being processed
 @pwd=();
 
@@ -138,6 +144,10 @@ $Apache::lonxml::registered=0;
 # a pointer the the Apache request object
 $Apache::lonxml::request='';
 
+# a problem number counter, and check on hether it is used
+$Apache::lonxml::counter=0;
+$Apache::lonxml::counter_changed=0;
+
 sub xmlbegin {
   my $output='';
   if ($ENV{'browser.mathml'}) {
@@ -232,7 +242,7 @@ sub xmlend {
           }
           if ($discussiononly) {
 	      $discussion.=(<<ENDDISCUSS);
-<form action="/adm/feedback" method="post">
+<form action="/adm/feedback" method="post" name="mailform">
 <input type="submit" name="discuss" value="Post Discussion" />
 <input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
 <input type="hidden" name="symb" value="$symb" />
@@ -243,6 +253,7 @@ course faculty</font><br />
 <textarea name=comment cols=60 rows=10 wrap=hard></textarea>
 </form>
 ENDDISCUSS
+             $discussion.=&Apache::lonfeedback::generate_preview_button();
           }
        }
     }
@@ -380,6 +391,10 @@ sub registerurl {
     $Apache::lonxml::registered=1;
     my $nothing='';
     if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+    my $newmail='';
+    if (&Apache::lonmsg::newmail()) { 
+       $newmail='menu.setstatus("you have","messages");';
+    }
     my $timesync='menu.syncclock(1000*'.time.');';
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
         my $hwkadd='';
@@ -409,6 +424,7 @@ ENDPARM
 	  menu=window.open("$nothing","LONCAPAmenu","",false);
           menu.clearTimeout(menu.menucltim);
           $timesync
+          $newmail
 	  menu.currentURL=window.location.pathname;
           menu.reloadURL=window.location.pathname;
           menu.currentStale=0;
@@ -547,6 +563,7 @@ sub xmlparse {
  if ($ENV{'request.uri'}) {
     &writeallows($ENV{'request.uri'});
  }
+ if ($Apache::lonxml::counter_changed) { &store_counter() }
  return $finaloutput;
 }
 
@@ -577,11 +594,7 @@ sub latex_special_symbols {
     $current_token=~s/\^/\\char94 /g;
     $current_token=~s/\~/\\char126 /g;
     $current_token=~s/(&[^a-z\#])/\\$1/g;
-    if ($current_token=~/ \#\w/) {
-	$current_token=~s/ \#(\w)/ \\#$1/;
-    } else {
-	$current_token=~s/([^&]\#)/\\$1/g;
-    }
+    $current_token=~s/([^&])\#/$1\\#/g;
     $current_token=~s/(\$|_|{|})/\\$1/g;
     $current_token=~s/\\char92 /\\texttt{\\char92}/g;
     $current_token=~s/>/\$>\$/g; #more
@@ -843,6 +856,9 @@ sub setup_globals {
   my ($request,$target)=@_;
   $Apache::lonxml::request=$request;
   $Apache::lonxml::registered = 0;
+  $errorcount=0;
+  $warningcount=0;
+  &init_counter();
   @Apache::lonxml::pwd=();
   @Apache::lonxml::extlinks=();
   if ($target eq 'meta') {
@@ -1026,6 +1042,26 @@ sub get_all_text_unbalanced {
  return $result
 }
 
+sub increment_counter {
+    $Apache::lonxml::counter++;
+    $Apache::lonxml::counter_changed=1;
+}
+
+sub init_counter {
+    if (defined($ENV{'form.counter'})) {
+	$Apache::lonxml::counter=$ENV{'form.counter'};
+    } elsif (not defined($Apache::lonxml::counter)) {
+	$Apache::lonxml::counter=1;
+	&store_counter();
+    }
+    $Apache::lonxml::counter_changed=0;
+}
+
+sub store_counter {
+    &Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));
+    return '';
+}
+
 sub get_all_text {
  my($tag,$pars)= @_;
  my $depth=0;
@@ -1317,11 +1353,12 @@ ENDNOTFOUND
 sub debug {
   if ($Apache::lonxml::debug eq 1) {
     $|=1;
-    print("DEBUG:".&HTML::Entities::encode($_[0])."<br />\n");
+    print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
   }
 }
 
 sub error {
+  $errorcount++;
   if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
     # If printing in construction space, put the error inside <pre></pre>
     print "<b>ERROR:</b>".join("\n",@_)."\n";
@@ -1347,6 +1384,7 @@ sub error {
 }
 
 sub warning {
+  $warningcount++;
   if ($ENV{'request.state'} eq 'construct') {
     print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
   }