"); + %field_hash = exists($data{'data.field.'.$syl_field}) ? + %{thaw($data{'data.field.'.$syl_field})} : + (); + $type = exists($field_hash{type}) ? $field_hash{type} : TYPE_TEXT_HTML; + chomp($field); + $field=~s/\s+$//s; + $field=~s/^\s+//s; + $field=~s/\
"); + if (exists($data{'data.field.'.$old_new_map{$old_field}})) { + $r->print("updating old field ".$old_field."
"); + my %new_field = %{thaw($data{'data.field.'.$old_new_map{$old_field}})}; + $data{$old_field} = $new_field{content}; + } } - $syllabus{'uploaded.domain'}=$env{'user.domain'}; - $syllabus{'uploaded.name'}=$env{'user.name'}; - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); + + &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum); } } @@ -306,6 +397,18 @@ ENDSCRIPT :'') .'\\\\'); } + if ($allowed && $data{'properties.v2_converted'} == 1) { + $r->print("This document was created with LON-CAPA 2.x. Modifying it may cause it to not display correctly on older servers.
"); + } + if ($allowed && $data{'properties.v2_conflict'} == 1) { + $r->print("This document was saved with LON-CAPA 3.x, then further edited in LON-CAPA 2.x.
"); + if ($data{'properties.v2_conflict_fail'} == 1) { + $r->print("Some fields in LON-CAPA 2.x no longer have an equivalent in LON-CAPA 3.x. These fields were appended; some fields may be duplicated or not match.
"); + } else { + $r->print("These changes were automatically transferred to LON-CAPA 3.x"); + } + } + #----------------------------Print Headtitle if ($target ne 'tex') { $r->print('
'.$courseenv{'description'}.'
'); @@ -314,6 +417,7 @@ ENDSCRIPT $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. &Apache::lonnet::domain($cdom,'description').'}\\\\'); } + # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); if ($target ne 'tex') { @@ -376,6 +480,7 @@ ENDSCRIPT } else { $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); } + # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($allowed) { @@ -384,11 +489,10 @@ ENDSCRIPT } my @htmlids=(); my $url_include_handler = sub { - my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_; - my %data = %{$data_ref}; - my %fields = %{$fields_ref}; - my $urls=$message; - $message=''; + my ($r, $field, $json_ref, $group, $target, $allowed) = @_; + my $message = $json_ref->{items}{$field}{content}; + my $title = $json_ref->{items}{$field}{title}; + my $urls = $message; foreach my $filelink (split(/\n/,$urls)) { my $output=''; # embed style? @@ -400,6 +504,7 @@ ENDSCRIPT $output=''.$output.'
'; } else { @@ -409,11 +514,11 @@ ENDSCRIPT } if ($allowed) { &Apache::lonfeedback::newline_to_br(\$urls); - &Apache::lontemplate::print_start_template($r,$fields{$field}. + &Apache::lontemplate::print_start_template($r,$title. &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box'); $r->print($urls); $r->print("");
- &Apache::lontemplate::print_textarea_template($r, $data{$field},
+ &Apache::lontemplate::print_textarea_template($r, $message,
$field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
&Apache::lontemplate::print_saveall_template($r);
$r->print("
");
@@ -423,9 +528,9 @@ ENDSCRIPT
$r->print($message);
}
};
- my %custom_hash = ( 'lll_includeurl' => $url_include_handler );
- @htmlids = &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields,
- $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
+ my %custom_hash = ( TYPE_URL_INCLUDE() => $url_include_handler );
+ @htmlids = &print_template_new_fields($r, \%data,
+ $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash);
if ($allowed) {
$r->print(''.
&Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
@@ -448,5 +553,112 @@ ENDSCRIPT
return OK;
}
+sub print_template_new_fields {
+ my ($r, $data_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_;
+ my @html_ids = ();
+ my %data = %{$data_ref};
+ my @fields = @{thaw($data{'data.fields'})};
+ my %custom_handlers = %{$custom_handlers_ref};
+
+ foreach my $key (@fields) {
+ my %field = %{thaw($data{'data.field.'.$key})};
+ my $title = $field{title};
+ my $raw_message = $field{content};
+ my $type = $field{type};
+ my $message = $raw_message if (($raw_message=~/\w/) || ($allowed));
+ if ((%custom_handlers) && exists($custom_handlers{$type})) {
+ #$custom_handlers{$type}->($r, $field, $json_ref, $group, $target, $allowed);
+ } else {
+ if (($raw_message=~/\w/) || ($allowed)) {
+ if (!&Apache::lonfeedback::contains_block_html($message)) {
+ &Apache::lonfeedback::newline_to_br(\$message);
+ } else {
+ $message = &Apache::lonfeedback::tidy_html($message);
+ }
+ $message=&Apache::lonhtmlcommon::raw_href_to_link($message);
+ if ($allowed) {
+ $message=&Apache::lonspeller::markeduptext($message);
+ }
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ if ($target ne 'tex') {
+ #output of syllabusfields will be generated here.
+ &Apache::lontemplate::print_start_template($r,$title,'LC_Box');
+ $r->print($message);
+ if ($allowed) {
+ $r->print("");
+ &Apache::lontemplate::print_textarea_template($r, $raw_message,
+ $key, $default_rich_text);
+ &Apache::lontemplate::print_saveall_template($r);
+ if (!exists($data{'properties.v2_converted'})) {
+ $r->print("Delete");
+ }
+ $r->print("
");
+ }
+ &Apache::lontemplate::print_end_template($r);
+ } else {
+ my $safeinit;
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',''.$title.'
')); + $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); + } + push(@html_ids,"hello"); + } + } + } + + return @html_ids; +} + +sub convert_from_v2 { + my ($r, $data_ref, $fields_ref, $conflict) = @_; + my %data = %{$data_ref}; + my %fields = %{$fields_ref}; + my @fields_order = (!$conflict) ? () : @{thaw($data{'data.fields'})}; + my %old_new_map = (!$conflict) ? () : %{thaw($data{'data.old_new_map'})}; + my $repeat_int = 0; #ensure fields with created timestamp are unique + foreach my $element (sort(keys(%fields))) { + my %new_element = (); + my $title = $fields{$element}; + my $title_hash = time."_".$$; + if (exists($data{'data.field.'.$title_hash})) { + $title_hash .= "_".$repeat_int++; + } + my $content = $data{$element}; + $new_element{title} = $title; + $new_element{content} = $content; + if ($element eq 'lll_includeurl') { + $new_element{type} = TYPE_URL_INCLUDE; + } else { + $new_element{type} = TYPE_TEXT_HTML; + } + if (!$conflict) { + $r->print("Creating new field with ID: ".$title_hash.""); + $data{'data.field.'.$title_hash} = freeze(\%new_element); + $old_new_map{$element} = $title_hash; + push(@fields_order, $title_hash); + } else { + if (exists($old_new_map{$element})) { + $r->print("Transferring old field ".$element." to new ID: ".$old_new_map{$element}."
"); + if (exists($data{'data.field.'.$old_new_map{$element}})) { + my %new_field = %{thaw($data{'data.field.'.$old_new_map{$element}})}; + $new_field{content} = $content; + $data{'data.field.'.$old_new_map{$element}} = freeze(\%new_field); + } + } else { + $data{'data.field.'.$title_hash} = freeze(\%new_element); + $old_new_map{$element} = $title_hash; + $data{'properties.v2_conflict_fail'} = 1; + push(@fields_order, $title_hash); + } + } + } + $data{'data.fields'} = freeze(\@fields_order); + $data{'data.old_new_map'} = freeze(\%old_new_map); + $data{'properties.last_modified'} = time; + $data{'properties.v2_converted'} = 1; + $data{'properties.type'} = 'syllabus'; + + return \%data; +} + 1; __END__