[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf startup.pl /homework bridgetask.pm lonhomework.pm /xml lonxml.pm doc/loncapafiles loncapafiles.lpml
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 16 Mar 2005 19:09:44 -0000
This is a MIME encoded message
--albertel1111000184
Content-Type: text/plain
albertel Wed Mar 16 14:09:44 2005 EDT
Added files:
/loncom/homework bridgetask.pm
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom loncapa_apache.conf startup.pl
/loncom/homework lonhomework.pm
/loncom/xml lonxml.pm
Log:
- can do a very simplistic rendering of a bridge task, doesn't actually implement any of the functionality, just puls it a part, picks the first <Instance> in a <Dimension> and wraps the <Criteria> in a <table> , enough to get started on implementing the proper acces controls logic
--albertel1111000184
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20050316140944.txt"
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.417 doc/loncapafiles/loncapafiles.lpml:1.418
--- doc/loncapafiles/loncapafiles.lpml:1.417 Wed Mar 9 14:39:32 2005
+++ doc/loncapafiles/loncapafiles.lpml Wed Mar 16 14:09:43 2005
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.417 2005/03/09 19:39:32 www Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.418 2005/03/16 19:09:43 albertel Exp $ -->
<!--
@@ -4114,6 +4114,15 @@
<status>works/unverified</status>
</file>
<file>
+ <source>loncom/homework/bridgetask.pm</source>
+ <target dist='default'>home/httpd/lib/perl/Apache/bridgetask.pm</target>
+ <categoryname>handler</categoryname>
+ <description>
+implements the tags for supporting bridge tasks
+ </description>
+ <status>works/unverified</status>
+</file>
+<file>
<source>loncom/homework/response.pm</source>
<target dist='default'>home/httpd/lib/perl/Apache/response.pm</target>
<categoryname>handler</categoryname>
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.106 loncom/loncapa_apache.conf:1.107
--- loncom/loncapa_apache.conf:1.106 Tue Mar 15 17:17:20 2005
+++ loncom/loncapa_apache.conf Wed Mar 16 14:09:43 2005
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.106 2005/03/15 22:17:20 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.107 2005/03/16 19:09:43 albertel Exp $
##
#
@@ -269,7 +269,7 @@
PerlHandler Apache::lonxml
</LocationMatch>
-<LocationMatch "^/+(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/+(res|\~).*\.(task|problem|exam|quiz|assess|survey|form|library)$">
SetHandler perl-script
PerlHandler Apache::lonhomework
</LocationMatch>
Index: loncom/startup.pl
diff -u loncom/startup.pl:1.19 loncom/startup.pl:1.20
--- loncom/startup.pl:1.19 Tue Dec 28 17:30:28 2004
+++ loncom/startup.pl Wed Mar 16 14:09:43 2005
@@ -119,6 +119,7 @@
use Apache::scripttag();
use Apache::structuretags();
use Apache::portfolio();
+use Apache::bridgetask();
# can't include this one due to the way it does it's BEGIN
use Apache::loncreateuser();
1;
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.197 loncom/homework/lonhomework.pm:1.198
--- loncom/homework/lonhomework.pm:1.197 Mon Feb 28 22:24:05 2005
+++ loncom/homework/lonhomework.pm Wed Mar 16 14:09:43 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.197 2005/03/01 03:24:05 albertel Exp $
+# $Id: lonhomework.pm,v 1.198 2005/03/16 19:09:43 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -209,6 +209,10 @@
}
return $allowed;
}
+
+sub check_task_access {
+ return &check_access;
+}
# JB, 9/24/2002: Any changes in this function may require a change
# in lonnavmaps::resource::getDateStatus.
sub check_access {
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.364 loncom/xml/lonxml.pm:1.365
--- loncom/xml/lonxml.pm:1.364 Wed Mar 16 10:46:42 2005
+++ loncom/xml/lonxml.pm Wed Mar 16 14:09:44 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.364 2005/03/16 15:46:42 albertel Exp $
+# $Id: lonxml.pm,v 1.365 2005/03/16 19:09:44 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1056,7 +1056,8 @@
sub newparser {
my ($parser,$contentref,$dir) = @_;
push (@$parser,HTML::LCParser->new($contentref));
- $$parser['-1']->xml_mode('1');
+ $$parser[-1]->xml_mode(1);
+ $$parser[-1]->marked_sections(1);
if ( $dir eq '' ) {
push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
} else {
Index: loncom/homework/bridgetask.pm
+++ loncom/homework/bridgetask.pm
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
# $Id: bridgetask.pm,v 1.1 2005/03/16 19:09:44 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#
# LON-CAPA is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# LON-CAPA is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LON-CAPA; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
#
# http://www.lon-capa.org/
#
###
package Apache::bridgetask;
use strict;
use Apache::lonnet;
use Apache::File();
use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
}
sub start_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
#&initialize_storage();
my $status;
my $accessmsg;
#should get back a <html> or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex') {
($status,$accessmsg) = &Apache::lonhomework::check_task_access('0');
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
&Apache::run::run($expression,$safeeval);
&Apache::lonxml::debug("Got $status");
if (( $status eq 'CLOSED' ) ||
( $status eq 'BANNED') ||
( $status eq 'UNAVAILABLE') ||
( $status eq 'INVALID_ACCESS')) {
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
if ( $target eq "web" ) {
$result.= $head_tag_start.'</head>';
my $msg=$body_tag_start;
if ($status eq 'UNAVAILABLE') {
$msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
} elsif ($status ne 'NOT_YET_VIEWED') {
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
}
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.='The problem '.$accessmsg;
}
$result.=$msg.'<br />';
} elsif ($target eq 'tex') {
$result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm';
if ($status eq 'UNAVAILABLE') {
$result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
} else {
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
}
}
} elsif ($target eq 'web') {
my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
$result.="$head_tag_start<title>$name</title></head>
$body_tag_start \n $form_tag_start".
'<input type="hidden" name="submitted" value="yes" />';
# if we are viewing someone else preserve that info
if (defined $ENV{'form.grade_symb'}) {
foreach my $field ('symb','courseid','domain','username') {
$result .= '<input type="hidden" name="grade_'.$field.
'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
}
}
}
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
}
return $result;
}
sub end_Task {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
if (
(($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
($target eq 'answer') || ($target eq 'tex')
) {
if ($target eq 'web') {
$result.=&Apache::lonxml::xmlend().'</html>';
}
}
if ($target eq 'grade') {
#&Apache::lonhomework::showhash(%Apache::lonhomework::results);
#&finalize_storage();
}
} elsif ($target eq 'meta') {
#$result=&Apache::response::mandatory_part_meta;
#$result.=&Apache::response::meta_part_order();
#$result.=&Apache::response::meta_response_order();
}
return $result;
}
sub start_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
$result='<table border="1"><tr><td>Closing</td></tr><tr><td>';
}
return $result;
}
sub end_ClosingParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
$result='</td></tr></table>';
}
return $result;
}
my %dimension;
my $dim_id;
sub start_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
undef(%dimension);
$dim_id=$Apache::lonxml::curdepth;
return '';
}
sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
#FIXME just grabbing the first one for now, need
#to randomly pick one until all have been seen
#then start repicking
my $instance=$dimension{'instances'}->[0];
my $result=$dimension{'intro'}.
$dimension{$instance.'.text'}.
'<table border="1"><tr><td>Criteria</td></tr><tr><td>';
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
$result.=$dimension{$instance.'.criteria.'.$id}.
'</td></tr><tr><td>';
}
$result=~s/<tr><td>$//;
$result.='</table>';
}
return $result;
}
sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
if ($tagstack->[-2] eq 'Dimension') {
&Apache::lonxml::startredirection();
} else {
$result='<table border="1"><tr><td>Intro</td></tr><tr><td>';
}
}
return $result;
}
sub end_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
if ($tagstack->[-2] eq 'Dimension') {
$dimension{'intro'}=&Apache::lonxml::endredirection();
} else {
$result='</td></tr></table>';
}
}
return $result;
}
my $instance_id;
sub start_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);
$instance_id=$Apache::lonxml::curdepth;
return '';
}
sub end_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
return '';
}
sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web') {
&Apache::lonxml::startredirection();
}
return '';
}
sub end_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web') {
$dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
}
return '';
}
sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web') {
&Apache::lonxml::startredirection();
}
return '';
}
sub end_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web') {
my $criteria=&Apache::lonxml::endredirection();
my $id=$Apache::lonxml::curdepth;
$dimension{$instance_id.'.criteria.'.$id}=$criteria;
push(@{$dimension{$instance_id.'.criterias'}},$id);
}
return '';
}
1;
__END__
--albertel1111000184--