Found no analyzable parts in this problem,
+ currently only Numerical, Formula and String response
+ styles are supported.
');
+ }
+ &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
+ &analyze_footer($request);
+ &Apache::lonhomework::showhash(%overall);
+ return $result;
+}
+
sub editxmlmode {
my ($request,$file) = @_;
my $result;
my $problem=&Apache::lonnet::getfile($file);
- if ($problem == -1) {
+ if ($problem eq -1) {
&Apache::lonxml::error(" Unable to find $file");
$problem='';
}
@@ -256,22 +462,35 @@ 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::helpLatexCheatsheet("Problem_Editor_XML_Index",
+ "Problem Editing Help");
+ if ($cols > 80) { $cols = 80; }
+ if ($cols < 70) { $cols = 70; }
+ if ($rows < 20) { $rows = 20; }
+ $result.='
';
- $request->print($result);
+ $request->print($result);
+ }
return '';
}
@@ -279,47 +498,40 @@ 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);
- if ($problem == -1) {
+ if ($problem eq -1) {
&Apache::lonxml::error(" Unable to find $file");
$problem='';
}
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);
-
+ if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
+ 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);
+ undef($Apache::lonhomework::parsing_a_problem);
#$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:::;
#$result.=" Spent $td seconds processing target $target\n";
#}
$request->print($result);
+ $request->rflush();
}
#$request->print(":Result ends");
#my $td=&tv_interval($t0);
@@ -331,6 +543,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 +551,64 @@ 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 ($request) = @_;
+ my $extension=$request->uri;
+ $extension=~s:^.*\.([\w]+)$:$1:;
+ &Apache::lonxml::debug("Looking for :$extension:");
my $templatelist=&get_template_list('',$extension);
- my $url=$request->uri;
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- $request->print(<uri);
+ copy($file,$dest);
+ &renderpage($request,$dest);
+ } elsif($ENV{'form.newfile'} && !$templatelist) {
+ # 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 $url=$request->uri;
+ my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ my $errormsg;
+ if ($ENV{'form.newfile'}) {
+ $errormsg='
You did not select a template.
'."\n";
+ }
+ 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
-
-