--- loncom/homework/structuretags.pm	2003/04/03 21:08:33	1.163
+++ loncom/homework/structuretags.pm	2003/05/03 20:35:43	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.163 2003/04/03 21:08:33 albertel Exp $
+# $Id: structuretags.pm,v 1.167 2003/05/03 20:35:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,7 @@ use Apache::File();
 use Apache::lonmenu;
 
 BEGIN {
-    &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
 }
 
 sub start_web {
@@ -104,8 +104,9 @@ sub page_start {
 	}
 	$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
 	if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
-	    my ($symb)=&Apache::lonxml::whichuser();
-	    if ($symb eq '') {
+	    my ($symb,undef,undef,undef,$publicuser)=
+		&Apache::lonxml::whichuser();
+	    if ($symb eq '' && !$publicuser) {
 		my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
 		$help="Browsing resource, all submissions are temporary.<br />";
 		$body_tag_start.=$help;
@@ -270,6 +271,11 @@ sub start_problem {
     @Apache::structuretags::whileconds=();
     @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();
+    $Apache::lonhomework::scantronmode=0;
+
+    if (defined($ENV{'scantron.maxquest'})) {
+	$Apache::lonhomework::scantronmode=1;
+    }
 
     if ($target ne 'analyze') {
 	&initialize_storage();
@@ -279,7 +285,7 @@ sub start_problem {
 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
 	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
     }
-    if ($Apache::lonhomework::type eq '') {
+    if ($Apache::lonhomework::type eq '' ) {
 	my $uri=$ENV{'request.uri'};
 	if ($uri=~/\.(\w+)$/) {
 	    $Apache::lonhomework::type=$1;
@@ -323,7 +329,9 @@ sub start_problem {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseed.'" />'.
 		    '<input type="submit" name="resetdata"
-                             value="New Problem Variation" />';
+                             value="New Problem Variation" />'.
+		    '<input type="hidden" name="username"
+                             value="'.$ENV{'form.username'}.'" />';
 	}
 	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
 	push (@Apache::inputtags::status,$status);
@@ -595,6 +603,59 @@ sub end_block {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     if ($target eq "edit") {
+	$result.= &Apache::edit::tag_end($target,$token,'');
+    }
+    return $result;
+}
+
+sub start_languageblock {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+
+    my $result;
+
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
+	my $include = $token->[2]->{'include'};
+	my $exclude = $token->[2]->{'exclude'};
+        my %languages=&Apache::loncommon::display_languages();
+        $result='1';
+	if ($include) {
+            $result='';
+            foreach (split(/\,/,$include)) {
+                if ($languages{$_}) { $result='1'; }
+            }
+	}
+        if ($exclude) {
+            foreach (split(/\,/,$exclude)) {
+                if ($languages{$_}) { $result='0'; }
+            }
+	}
+	if ( ! $result ) {
+	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser);
+	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+	}
+	$result='';
+    } elsif ($target eq 'edit') {
+	$result .=&Apache::edit::tag_start($target,$token);
+	$result .=&Apache::edit::text_arg('Include Language:','include',
+					  $token,40);
+	$result .=&Apache::edit::text_arg('Exclude Language:','exclude',
+					  $token,40);
+	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'include')
+                        .&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'exclude');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_languageblock {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
     }
     return $result;