');
+ }
+ }
+ &Apache::lonhomework::showhash(%overall);
+ return $result;
+}
+
sub editxmlmode {
my ($request,$file) = @_;
my $result;
@@ -256,22 +380,34 @@ sub editxmlmode {
\$ENV{'form.editxmltext'});
if (!$error) { $problem=&Apache::lonnet::getfile($file); }
}
- my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
- if ($cols > 80) { $cols = 80; }
- $result.='
+ &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+ if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+ &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+ $ENV{'form.problemmode'}='View';
+ &renderpage($request,$file);
+ } else {
+ my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+ my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index");
+ if ($cols > 80) { $cols = 80; }
+ if ($cols < 70) { $cols = 70; }
+ if ($rows < 20) { $rows = 20; }
+ $result.='
';
- $request->print($result);
+ $request->print($result);
+ }
return '';
}
@@ -279,6 +415,7 @@ sub renderpage {
my ($request,$file) = @_;
my (@targets) = &get_target();
+ &Apache::lonxml::debug("Running targets ".join(':',@targets));
foreach my $target (@targets) {
#my $t0 = [&gettimeofday()];
my $problem=&Apache::lonnet::getfile($file);
@@ -289,31 +426,25 @@ sub renderpage {
my %mystyle;
my $result = '';
- &Apache::inputtags::initialize_inputtags;
- &Apache::edit::initialize_edit;
- if ($target eq 'web') {
- if (&Apache::lonnet::symbread() eq '') {
- if ($ENV{'request.state'} eq "construct") {
- } else {
- $request->print("Browsing or ambiguous reference, submissions ignored ");
- }
- }
- #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
- }
- #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
-
- my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
- if ($default == -1) {
- &Apache::lonxml::error("Unable to find default_homework.lcpm");
- $default='';
- }
- $result = &Apache::lonxml::xmlparse($target, $problem,
- $default.&setup_vars($target),%mystyle);
+ &Apache::inputtags::initialize_inputtags();
+ &Apache::outputtags::initialize_outputtags();
+ &Apache::edit::initialize_edit();
+ if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }
+ if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
+ if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
+
+ &Apache::lonxml::debug("Should be parsing now");
+ $result = &Apache::lonxml::xmlparse($request, $target, $problem,
+ &setup_vars($target),%mystyle);
#$request->print("Result follows:");
if ($target eq 'modified') {
&handle_save_or_undo($request,\$problem,\$result);
} else {
+ if ($target eq 'analyze') {
+ $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
+ undef(%Apache::lonhomework::analyze);
+ }
#my $td=&tv_interval($t0);
#if ( $Apache::lonxml::debug) {
#$result =~ s:::;
@@ -331,6 +462,7 @@ sub renderpage {
sub get_template_list {
my ($namewanted,$extension) = @_;
my $result;
+ my @allnames;
&Apache::lonxml::debug("Looking for :$extension:");
foreach my $file () {
my $name=&Apache::lonnet::metadata($file,'title');
@@ -338,42 +470,59 @@ sub get_template_list {
$result=$file;
last;
} else {
- $result.="";
+ if ($name) { push (@allnames, $name); }
}
}
+ if (@allnames && !$result) {
+ $result="\n';
+ }
return $result;
}
sub newproblem {
- my ($request) = @_;
-
- my $extension=$request->uri;
- $extension=~s:^.*\.([\w]+)$:$1:;
- &Apache::lonxml::debug("Looking for :$extension:");
- if ($ENV{'form.template'}) {
- use File::Copy;
- my $file = &get_template_list($ENV{'form.template'},$extension);
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- copy($file,$dest);
- &renderpage($request,$file);
- } else {
- my $templatelist=&get_template_list('',$extension);
- my $url=$request->uri;
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- $request->print(<uri;
+ $extension=~s:^.*\.([\w]+)$:$1:;
+ &Apache::lonxml::debug("Looking for :$extension:");
+ if ($ENV{'form.template'} &&
+ $ENV{'form.template'} ne "Select a $extension type") {
+ use File::Copy;
+ my $file = &get_template_list($ENV{'form.template'},$extension);
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ copy($file,$dest);
+ &renderpage($request,$dest);
+ } elsif($ENV{'form.newfile'}) {
+ # I don't like hard-coded filenames but for now, this will work.
+ use File::Copy;
+ my $templatefilename =
+ $request->dir_config('lonIncludes').'/templates/blank.problem';
+ &Apache::lonxml::debug("$templatefilename");
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ copy($templatefilename,$dest);
+ &renderpage($request,$dest);
+ } else {
+ my $templatelist=&get_template_list('',$extension);
+ my $url=$request->uri;
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ my $instructions;
+ if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
+ $request->print(<
-The request file $url doesn\'t exist. You can create a new $extension
-
-
+
Creating a new $extension resource
+The requested file $url currently does not exist.
+
+To create a new $extension$instructions click on the "Create $extension" button.
+
+");
+ }
+ return '';
}
sub view_or_edit_menu {
@@ -393,7 +542,8 @@ sub handler {
#my $t0 = [&gettimeofday()];
my $request=$_[0];
- if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+# if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+ $Apache::lonxml::debug=$ENV{'user.debug'};
if (&setupheader($request)) { return OK; }
$ENV{'request.uri'}=$request->uri;
@@ -402,6 +552,16 @@ sub handler {
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
$Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
+ # some times multiple problemmodes are submitted, need to select
+ # the last one
+ &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
+ if ( defined($ENV{'form.problemmode'}) &&
+ ref($ENV{'form.problemmode'}) ) {
+ &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
+ my $mode=$ENV{'form.problemmode'}->[-1];
+ undef $ENV{'form.problemmode'};
+ $ENV{'form.problemmode'}=$mode;
+ }
&Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
my $file=&Apache::lonnet::filelocation("",$request->uri);
@@ -427,6 +587,8 @@ sub handler {
&renderpage($request,$file);
} elsif ($ENV{'form.problemmode'} eq 'EditXML') {
&editxmlmode($request,$file);
+ } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') {
+ &analyze($request,$file);
} else {
&renderpage($request,$file);
}
@@ -436,6 +598,7 @@ sub handler {
}
} else {
# just render the page normally outside of construction space
+ &Apache::lonxml::debug("not construct");
&renderpage($request,$file);
}
#my $td=&tv_interval($t0);
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.