--- loncom/interface/londocs.pm 2011/07/04 16:47:03 1.455
+++ loncom/interface/londocs.pm 2011/10/31 01:22:25 1.462
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.455 2011/07/04 16:47:03 raeburn Exp $
+# $Id: londocs.pm,v 1.462 2011/10/31 01:22:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -176,7 +176,7 @@ sub dumpcourse {
$newfilename=&clean($newfilename);
$newfilename.='.'.$ext;
my @dirs=split(/\//,$newfilename);
- my $path='/home/'.$ca.'/public_html';
+ my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
my $makepath=$path;
my $fail=0;
for (my $i=0;$i<$#dirs;$i++) {
@@ -681,7 +681,8 @@ sub build_package {
$currdirpath = 'Top';
my $pcslist = $curRes->map_hierarchy();
if ($pcslist ne '') {
- foreach my $pc (split(/,/,$pcslist)) {
+ foreach my $pc (split(/,/,$pcslist),$curRes->map_pc()) {
+ next if ($pc <= 1);
my $res = $navmap->getByMapPc($pc);
if (ref($res)) {
my $encloser = $res->title();
@@ -896,7 +897,8 @@ sub replicate_content {
grade_courseid => $cdom.'_'.$cnum,
grade_domain => $env{'user.domain'},
grade_username => $env{'user.name'},
- grade_imsexport => 1,
+ grade_imsexport => 1,
+ instructor_comments => 'hide',
);
my $feedurl=&Apache::lonnet::clutter($url);
my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form);
@@ -917,11 +919,11 @@ sub replicate_content {
$foilcounter ++;
} elsif ($line =~ m{(|\Q\E)\Q
Correct:\E(|\Q\E)\Q
\E}) {
$line =~ s/^(\s+|\s+)$//g;
$line =~ s{^\Q\E([^<]+)\Q\E$}{1};
- push(@tosave,$line);
+ $tosave[$foilcounter] .= $line.' ';
}
$content = join("\t",@tosave);
if ($mc_answer) {
@@ -1611,7 +1613,8 @@ sub handle_edit_cmd {
}
sub editor {
- my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
+ my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
+ $supplementalflag,$orderhash)=@_;
my $container= ($env{'form.pagepath'}) ? 'page'
: 'sequence';
@@ -1740,7 +1743,7 @@ sub editor {
$r->print('');
}
- my $output;
+ my ($to_show,$output);
&Apache::loncommon::start_data_table_count(); #setup a row counter
foreach my $res (@LONCAPA::map::order) {
@@ -1757,30 +1760,38 @@ sub editor {
&Apache::loncommon::end_data_table_count();
if ($shown) {
- $r->print(&Apache::loncommon::start_scrollbox('900px','880px','400px')
- .&Apache::loncommon::start_data_table());
+ $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
+ .&Apache::loncommon::start_data_table(undef,'contentlist');
if ($allowed) {
- $r->print(&Apache::loncommon::start_data_table_header_row()
+ $to_show .= &Apache::loncommon::start_data_table_header_row()
.'
' + $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll') + .'
'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'
'; + $$upload_output = ''.&mt('Unable to save file [_1].',''.$filename.'').'
'; + $$upload_output = ''.$errtext.'
'; + $$upload_output = '