--- loncom/homework/edit.pm 2003/02/07 22:03:21 1.45 +++ loncom/homework/edit.pm 2003/11/05 21:53:48 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.45 2003/02/07 22:03:21 albertel Exp $ +# $Id: edit.pm,v 1.71 2003/11/05 21:53:48 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ package Apache::edit; use strict; use Apache::lonnet(); use HTML::Entities(); +use Apache::lonlocal; # Global Vars # default list of colors to use in editing @@ -40,311 +41,347 @@ use HTML::Entities(); # depth of nesting of edit $Apache::edit::colordepth=0; @Apache::edit::inserttag=(); +# image-type responses: active background image and curdepth at definition +$Apache::edit::bgimgsrc=''; +$Apache::edit::bgimgsrccurdepth=''; sub initialize_edit { - $Apache::edit::colordepth=0; - @Apache::edit::inserttag=(); + $Apache::edit::colordepth=0; + @Apache::edit::inserttag=(); } sub tag_start { - my ($target,$token,$description) = @_; - my $result=''; - if ($target eq "edit") { - my $tag=$token->[1]; - if (!$description) { - $description=&Apache::lonxml::description($token); - if (!$description) { $description="<$tag>"; } - } - $result.= &start_table($token)."$description -Delete". - &deletelist($target,$token) - ." -". - &insertlist($target,$token).&end_row().&start_spanning_row(); + my ($target,$token,$description) = @_; + my $result=''; + if ($target eq "edit") { + my $tag=$token->[1]; + if (!$description) { + $description=&Apache::lonxml::description($token); + if (!$description) { $description="<$tag>"; } + } + $result.= &start_table($token)."$description + Delete". + &deletelist($target,$token) + ." + ". + &insertlist($target,$token); #". # &movebuttons($target,$token). # "\n"; - } - return $result; + my @help = Apache::lonxml::helpinfo($token); + if ($help[0]) { + $result .= '' . + Apache::loncommon::help_open_topic(@help) . + ''; + } else { $result .= " "; } + $result .= &end_row().&start_spanning_row(); + } + return $result; } sub tag_end { - my ($target,$token,$description) = @_; - my $result=''; - if ($target eq 'edit') { - my $tag=$token->[1]; - if (!defined($description)) { - $result.="</$tag> "; - } else { - if ($description ne '') { $result.="$description "; } + my ($target,$token,$description) = @_; + my $result=''; + if ($target eq 'edit') { + $result.="".&end_table()."\n"; } - $result.="".&end_table()."\n"; - } - return $result; + return $result; } sub start_table { - my ($token)=@_; - my $tag = $token->[1]; - my $tagnum; - foreach my $namespace (reverse @Apache::lonxml::namespace) { - my $testtag=$namespace.'::'.$tag; - $tagnum=$Apache::lonxml::insertlist{"$testtag.num"}; - if (defined($tagnum)) { last; } - } - if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; } - my $color = $Apache::lonxml::insertlist{"$tagnum.color"}; - if (!defined($color)) { - $color = $Apache::edit::colorlist[$Apache::edit::colordepth]; - } - $Apache::edit::colordepth++; - push(@Apache::edit::inserttag,$token->[1]); - my $result='
'; - $result.=''; - return $result; + my ($token)=@_; + my $tag = $token->[1]; + my $tagnum; + foreach my $namespace (reverse @Apache::lonxml::namespace) { + my $testtag=$namespace.'::'.$tag; + $tagnum=$Apache::lonxml::insertlist{"$testtag.num"}; + if (defined($tagnum)) { last; } + } + if (!defined ($tagnum)) {$tagnum=$Apache::lonxml::insertlist{"$tag.num"};} + my $color = $Apache::lonxml::insertlist{"$tagnum.color"}; + if (!defined($color)) { + $color = $Apache::edit::colorlist[$Apache::edit::colordepth]; + } + $Apache::edit::colordepth++; + push(@Apache::edit::inserttag,$token->[1]); + my $result='
'; + $result.='
'; + return $result; } sub end_table { - $Apache::edit::colordepth--; - my $result='
'; - $result.="
"; - - my ($tagname,$closingtag); - if (defined($Apache::edit::inserttag[-2])) { - $tagname=$Apache::edit::inserttag[-2]; - } else {$tagname='problem';} - if (defined($Apache::edit::inserttag[-1])) { - $closingtag=$Apache::edit::inserttag[-1]; - } - $result.=&innerinsertlist('edit',$tagname,$closingtag). - "
"; - pop(@Apache::edit::inserttag); - return $result; + $Apache::edit::colordepth--; + my $result=''; + $result.="
"; + + my ($tagname,$closingtag); + if (defined($Apache::edit::inserttag[-2])) { + $tagname=$Apache::edit::inserttag[-2]; + } else {$tagname='problem';} + if (defined($Apache::edit::inserttag[-1])) { + $closingtag=$Apache::edit::inserttag[-1]; + } + $result.=&innerinsertlist('edit',$tagname,$closingtag). + "
"; + pop(@Apache::edit::inserttag); + return $result; } -sub start_spanning_row { return '';} +sub start_spanning_row { return '';} sub start_row { return ''; } sub end_row { return ''; } sub movebuttons { - my ($target,$token) = @_; - my $result=''; - $result.=''; - return $result; + my ($target,$token) = @_; + my $result=''; + $result.=''; + return $result; } sub deletelist { - my ($target,$token) = @_; - my $result = " "; - return $result; + return $result; } sub handle_delete { - if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; } - my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=0; - if ($space) { - my $sub1="$space\:\:delete_$token->[1]"; - { - no strict 'refs'; - if (defined &$sub1) { - $result=&$sub1($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); - } - } - } - if (!$result) { - my $endtag='/'.$token->[1]; - my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser); - $$parser['-1']->get_token(); - &Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]"); - &Apache::lonxml::end_tag($tagstack,$parstack,$token); - } - return 1; + if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; } + my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=0; + if ($space) { + my $sub1="$space\:\:delete_$token->[1]"; + { + no strict 'refs'; + if (defined &$sub1) { + $result=&$sub1($target,$token,$tagstack,$parstack,$parser,$safeeval,$style); + } + } + } + if (!$result) { + my $endtag='/'.$token->[1]; + my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser); + $$parser['-1']->get_token(); + &Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]"); + &Apache::lonxml::end_tag($tagstack,$parstack,$token); + } + return 1; } sub get_insert_list { - my ($tagname) = @_; - my $result=''; - my @tagnums= (); - #&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist)))); - if ($Apache::lonxml::insertlist{"$tagname.which"}) { - push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} }); - } - foreach my $namespace (@Apache::lonxml::namespace) { - if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) { - push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} }); - } - } - if (@tagnums) { - my %options; - foreach my $tagnum (@tagnums) { - my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"}; - $options{$descrip} ="\n"; - } - foreach my $option (sort(keys(%options))) { $result.=$options{$option}; } - if ($result) { $result=''.$result; } - } - return $result; + my ($tagname) = @_; + my $result=''; + my @tagnums= (); + #&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist)))); + if ($Apache::lonxml::insertlist{"$tagname.which"}) { + push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} }); + } + foreach my $namespace (@Apache::lonxml::namespace) { + if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) { + push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} }); + } + } + if (@tagnums) { + my %options; + foreach my $tagnum (@tagnums) { + my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"}; + $options{$descrip} ="\n"; + } + foreach my $option (sort(keys(%options))) {$result.=$options{$option};} + if ($result) { $result=''.$result; } + } + return $result; } sub insertlist { - my ($target,$token) = @_; - return &innerinsertlist($target,$token->[1]); + my ($target,$token) = @_; + return &innerinsertlist($target,$token->[1]); } sub innerinsertlist { - my ($target,$tagname,$closingtag) = @_; - my $result; - my $after=''; - if ($closingtag) { - $after='_after_'.$closingtag; - } - if ($target eq 'edit') { - my $optionlist= &get_insert_list($tagname); - if ($optionlist) { - $result = "Insert: -" - } else { - $result=" "; + my ($target,$tagname,$closingtag) = @_; + my $result; + my $after=''; + if ($closingtag) { + $after='_after_'.$closingtag; + } + if ($target eq 'edit') { + my $optionlist= &get_insert_list($tagname); + if ($optionlist) { + $result = "Insert: + " + } else { + $result=" "; + } } - } - return $result; + return $result; } sub handle_insert { - if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } - my $result; - my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"}; - my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; - if ($func eq 'default') { - my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; - my $namespace; - if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } - $result.="\n<$newtag>\n"; - } else { - if (defined(&$func)) { - { - no strict 'refs'; - $result.=&$func(); - } + if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } + my $result; + my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"}; + my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; + if ($func eq 'default') { + my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; + my $namespace; + if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } + $result.="\n<$newtag>\n"; } else { - my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; - &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined."); + if (defined(&$func)) { + { + no strict 'refs'; + $result.=&$func(); + } + } else { + my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; + &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined."); + } } - } - return $result; + return $result; } sub handle_insertafter { - my $tagname=shift; - if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') - { return ''; } - my $result; - my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; - my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; - if ($func eq 'default') { - my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; - my $namespace; - if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } - $result.="\n<$newtag>\n"; - } else { - if (defined(&$func)) { - { - no strict 'refs'; - $result.=&$func(); - } + my $tagname=shift; + if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') + { return ''; } + my $result; + my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; + my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; + if ($func eq 'default') { + my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; + my $namespace; + if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } + $result.="\n<$newtag>\n"; } else { - my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; - &Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)"); + if (defined(&$func)) { + { + no strict 'refs'; + $result.=&$func(); + } + } else { + my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; + &Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)"); + } } - } - return $result; + return $result; +} + +sub insert_img { + return ' + '; } sub insert_responseparam { - return ' + return ' '; } sub insert_formularesponse { - return ' + return ' + + '; } sub insert_numericalresponse { - return ' + return ' + + '; } sub insert_stringresponse { - return ' + return ' + + '; } sub insert_essayresponse { - return ' + return ' '; } +sub insert_imageresponse { + return ' + + + + + + + +'; +} + sub insert_optionresponse { - return ' + return ' + + '; } sub insert_radiobuttonresponse { - return ' + return ' + + '; } sub insert_rankresponse { - return ' + return ' + + '; } sub insert_matchresponse { - return ' + return ' + + '; } @@ -352,43 +389,71 @@ sub insert_matchresponse { sub insert_displayduedate { return ''; } sub insert_displaytitle { return ''; } sub insert_hintpart { - return ' + return ' '; } -sub insert_numericalhint { +sub insert_hintgroup { return ' + + + +'; +} + +sub insert_numericalhint { + return ' '; } +sub insert_stringhint { + return ' + +'; +} + +sub insert_formulahint { + return ' + +'; +} + sub insert_radiobuttonhint { - return ' + return ' '; } +sub insert_optionhint { + return ' + +'; +} + sub insert_startouttext { - return "\n"; + return "\n"; } sub insert_script { - return "\n"; + return "\n"; } sub textarea_sizes { - my ($data)=@_; - my $count=0; - my $maxlength=-1; - foreach (split ("\n", $$data)) { $count++; + my ($data)=@_; + my $count=0; + my $maxlength=-1; + foreach (split ("\n", $$data)) { + $count+=int(length($_)/79); + $count++; if (length($_) > $maxlength) { $maxlength = length($_); } - } - my $rows = $count; - my $cols = $maxlength; - return ($rows,$cols); + } + my $rows = $count; + my $cols = $maxlength; + return ($rows,$cols); } sub editline { @@ -404,79 +469,131 @@ END } sub editfield { - my ($tag,$data,$description,$minwidth,$minheight)=@_; + my ($tag,$data,$description,$minwidth,$minheight)=@_; - my ($rows,$cols)=&textarea_sizes(\$data); - if ($cols > 80) { $cols = 80; } - if ($cols < $minwidth ) { $cols = $minwidth; } - if ($rows < $minheight) { $rows = $minheight; } - if ($description) { $description="
".$description."
"; } - return $description."\n".'   '."\n"; + my ($rows,$cols)=&textarea_sizes(\$data); + if ($cols > 80) { $cols = 80; } + if ($cols < $minwidth ) { $cols = $minwidth; } + if ($rows < $minheight) { $rows = $minheight; } + if ($description) { $description="
".$description."
"; } + return $description."\n".'   '."\n"; } sub modifiedfield { - my ($token) = @_; - my $result; + my ($endtag,$parser) = @_; + my $result; # foreach my $envkey (sort keys %ENV) { # &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}"); # } # &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth"); # &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"}); - $result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"}; - return $result; + $result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"}; + my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser); + # textareas throw away intial \n + if ($bodytext=~/^\n/) { $result="\n".$result; } + return $result; } # Returns a 1 if the token has been modified and you should rebuild the tag # side-effects, will modify the $token if new values are found sub get_new_args { - my ($token,$parstack,$safeeval,@args)=@_; - my $rebuild=0; - foreach my $arg (@args) { - #just want the string that it was set to - my $value=$token->[2]->{$arg}; - my $newvalue=$ENV{"form.$Apache::lonxml::curdepth.$arg"}; - &Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:"); - if ($value ne $newvalue) { - $token->[2]->{$arg}=$newvalue; - $rebuild=1; + my ($token,$parstack,$safeeval,@args)=@_; + my $rebuild=0; + foreach my $arg (@args) { + #just want the string that it was set to + my $value=$token->[2]->{$arg}; + my $element=&html_element_name($arg); + my $newvalue=$ENV{"form.$element"}; + &Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:"); + if (defined($newvalue) && $value ne $newvalue) { + if (ref($newvalue) eq 'ARRAY') { + $token->[2]->{$arg}=join(',',@$newvalue); + } else { + $token->[2]->{$arg}=$newvalue; + } + $rebuild=1; + } } - } - return $rebuild; + return $rebuild; } # looks for /> on start tags sub rebuild_tag { - my ($token) = @_; - my $result; - if ($token->[0] eq 'S') { - $result = '<'.$token->[1]; - while (my ($key,$val)= each(%{$token->[2]})) { - $val=~s:^\s+|\s+$::g; - $val=~s:"::g; #" - &Apache::lonxml::debug("setting :$key: to :$val:"); - $result.=' '.$key.'="'.$val.'"'; + my ($token) = @_; + my $result; + if ($token->[0] eq 'S') { + $result = '<'.$token->[1]; + while (my ($key,$val)= each(%{$token->[2]})) { + $val=~s:^\s+|\s+$::g; + $val=~s:"::g; #" + &Apache::lonxml::debug("setting :$key: to :$val:"); + $result.=' '.$key.'="'.$val.'"'; + } + if ($token->[4] =~ m:/>$:) { + $result.=' />'; + } else { + $result.='>'; + } + } elsif ( $token->[0] eq 'E' ) { + $result = '[1].'>'; } - if ($token->[4] =~ m:/>$:) { - $result.=' />'; - } else { - $result.='>'; + return $result; +} + +sub html_element_name { + my ($name) = @_; + return $name.'_'.$Apache::lonxml::curdepth; +} + +sub hidden_arg { + my ($name,$token) = @_; + my $result; + my $arg=$token->[2]{$name}; + $result=''; + return $result; +} + +sub checked_arg { + my ($description,$name,$list,$token) = @_; + my $result; + my $optionlist=""; + my $allselected=$token->[2]{$name}; + $result=&mt($description); + foreach my $option (@$list) { + my ($value,$text); + if ( ref($option) eq 'ARRAY') { + $value='value="'.$$option[0].'"'; + $text=$$option[1]; + $option=$$option[0]; + } else { + $text=$option; + $value='value="'.$option.'"'; + } + $result.="[0] eq 'E' ) { - $result = '[1].'>'; - } - return $result; + return $result; } sub text_arg { - my ($description,$name,$token,$size) = @_; - my $result; - if (!defined $size) { $size=20; } - my $arg=$token->[2]{$name}; - $result=$description.' '; - return $result; + my ($description,$name,$token,$size) = @_; + my $result; + if (!defined $size) { $size=20; } + my $arg=$token->[2]{$name}; + $result=&mt($description).' '; + return ''.$result.''; } sub select_arg { @@ -485,23 +602,25 @@ sub select_arg { my $optionlist=""; my $selected=$token->[2]{$name}; foreach my $option (@$list) { - my $value; + my ($text,$value); if ( ref($option) eq 'ARRAY') { $value='value="'.$$option[0].'"'; - $option=$$option[1]; + $text=$$option[1]; + $option=$$option[0]; } else { + $text=$option; $value='value="'.$option.'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; } else { - $optionlist.="\n"; + $optionlist.="\n"; } } - $result.=$description.'  '.$optionlist.' - '; + '; return $result; } @@ -512,45 +631,131 @@ sub select_or_text_arg { my $found=0; my $selected=$token->[2]{$name}; foreach my $option (@$list) { - my $value; + my ($text,$value); if ( ref($option) eq 'ARRAY') { $value='value="'.$$option[0].'"'; - $option=$$option[1]; + $text=$$option[1]; + $option=$$option[0]; } else { + $text=$option; $value='value="'.$option.'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; $found=1; } else { - $optionlist.="\n"; + $optionlist.="\n"; } } - $optionlist.="\n"; - if (($found) || (!$selected)) { - $result.=$description.' '; - } else { - $result.=&text_arg($description,$name,$token,$size); + $optionlist.="\n"; +# + my $element=&html_element_name($name); + my $selectelement='select_list_'.$element; + my $typeinelement='type_in_'.$element; + my $typeinvalue=($found?'':$selected); +# + my $hiddenvalue='this.form.'.$element.'.value'; + my $selectedindex='this.form.'.$selectelement.'.selectedIndex'; + my $selectedvalue='this.form.'.$selectelement. + '.options['.$selectedindex.'].value'; + my $typedinvalue='this.form.'.$typeinelement.'.value'; + my $selecttypeinindex='this.form.'.$selectelement.'.options.length'; + $description=&mt($description); +# + return (< +$description +  + + +ENDSELECTORTYPE +} + +#----------------------------------------------------- image coordinates +# single image coordinates, x, y +sub entercoords { + my ($idx,,$idy,$mode,$width,$height) = @_; + unless ($Apache::edit::bgimgsrc) { return ''; } + if ($idx) { $idx.='_'; } + if ($idy) { $idy.='_'; } + my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc); + my $form = 'lonhomework'; + my $element; + if (! defined($mode) || $mode eq 'attribute') { + $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth"); + } elsif ($mode eq 'textnode') { # for data between ... + $element = &Apache::lonnet::escape('homework_edit_'. + $Apache::lonxml::curdepth); } + my $formheight=''; + if ($height) { + $formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth; + } + my $formwidth=''; + if ($width) { + $formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth; + } + my $result = <<"ENDBUTTON"; +Click Coordinates +ENDBUTTON return $result; } +# coordinate pair (x1,y1)-(x2,y2) +sub entercoordpair { + my ($id,$mode,$width,$height) = @_; + unless ($Apache::edit::bgimgsrc) { return ''; } + my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc); + my $form = 'lonhomework'; + my $element; + if (! defined($mode) || $mode eq 'attribute') { + $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth"); + } elsif ($mode eq 'textnode') { # for data between ... + $element = &Apache::lonnet::escape('homework_edit_'. + $Apache::lonxml::curdepth); + } + my $formheight=''; + if ($height) { + $formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth; + } + my $formwidth=''; + if ($width) { + $formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth; + } + my $result = <<"ENDBUTTON"; +Click Coordinate Pair +ENDBUTTON + return $result; +} #----------------------------------------------------- browse sub browse { # insert a link to call up the filesystem browser (lonindexer) - my ($id, $mode) = @_; + my ($id, $mode, $titleid) = @_; my $form = 'lonhomework'; my $element; if (! defined($mode) || $mode eq 'attribute') { - $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$id"); + $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth"); } elsif ($mode eq 'textnode') { # for data between ... $element = &Apache::lonnet::escape('homework_edit_'. - $Apache::lonxml::curdepth); + $Apache::lonxml::curdepth); + } + my $titleelement; + if ($titleid) { + $titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'"; } my $result = <<"ENDBUTTON"; -Browse +Select ENDBUTTON return $result; } @@ -558,11 +763,21 @@ ENDBUTTON #----------------------------------------------------- browse sub search { # insert a link to call up the filesystem browser (lonindexer) - $_ = shift; + my ($id, $mode, $titleid) = @_; my $form = 'lonhomework'; - my $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$_"); + my $element; + if (! defined($mode) || $mode eq 'attribute') { + $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth"); + } elsif ($mode eq 'textnode') { # for data between ... + $element = &Apache::lonnet::escape('homework_edit_'. + $Apache::lonxml::curdepth); + } + my $titleelement; + if ($titleid) { + $titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'"; + } my $result = <<"ENDBUTTON"; -Search +Search ENDBUTTON return $result; }