--- loncom/interface/lonindexer.pm 2005/04/07 06:56:23 1.133 +++ loncom/interface/lonindexer.pm 2007/08/17 22:27:00 1.178 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.133 2005/04/07 06:56:23 albertel Exp $ +# $Id: lonindexer.pm,v 1.178 2007/08/17 22:27:00 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -53,7 +53,9 @@ use Apache::lonmeta; use Apache::File; use Apache::lonlocal; use Apache::lonsource(); +use Apache::groupsort(); use GDBM_File; +use LONCAPA qw(:match); # ---------------------------------------- variables used throughout the module my %hash; # global user-specific gdbm file @@ -104,7 +106,7 @@ sub handler { my $fileclr='#ffffe6'; my $line; - my (@attrchk,@openpath); + my (@attrchk,@openpath,$typeselect); my $uri=$r->uri; # -------------------------------------- see if called from an interactive mode @@ -116,24 +118,29 @@ sub handler { my $closebutton=''; my $groupimportbutton=''; my $colspan=''; - + $extrafield=''; my $diropendb = - "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db"; + "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db"; %hash = (); { my %dbfile; - if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_READER(),0640)) { + if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRITER(),0640)) { + if ($env{'form.launch'} eq '1') { + &start_fresh_session(\%dbfile); + } while(my($key,$value)=each(%dbfile)) { $hash{$key}=$value; } untie(%dbfile); } } +# - Evaluate actions from previous page (both cumulatively and chronologically) + if ($env{'form.catalogmode'} eq 'import' || $hash{'form.catalogmode'} eq 'import') { + &Apache::groupsort::update_actions_hash(\%hash); + } + { - if ($env{'form.launch'} eq '1') { - &start_fresh_session(); - } #Hijack lonindexer to verify a title and be close down. if ($env{'form.launch'} eq '2') { &Apache::loncommon::content_type($r,'text/html'); @@ -145,11 +152,7 @@ sub handler { $verify_title=~s/'/\\'/g; $extra='window.opener.document.forms["'.$env{'form.form'}.'"].elements["'.$env{'form.titleelement'}.'"].value=\''.$verify_title.'\';'; } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< - + my $js = < function load() { window.opener.document.forms["$env{'form.form'}"] @@ -159,11 +162,13 @@ sub handler { window.close(); } - - - - ENDSUBM + $r->print(&Apache::loncommon::start_page(undef,$js, + {'only_body' =>1, + 'add_entries' => + {'onload' => "load();"},} + ). + &Apache::loncommon::end_page()); return OK; } @@ -173,18 +178,18 @@ ENDSUBM # --------------------- define extra fields and buttons in case of special mode if ($env{'form.catalogmode'} eq 'interactive') { $extrafield=''. - ''; + ''; $colspan=" colspan='2' "; my $cl=&mt('Close'); $closebutton=< END } - elsif ($env{'form.catalogmode'} eq 'groupimport') { + elsif ($env{'form.catalogmode'} eq 'import') { $extrafield=''. - ''; + ''; $colspan=" colspan='2' "; my $cl=&mt('Close'); my $gi=&mt('Import'); @@ -231,7 +236,7 @@ END # ------ set catalogmodefunctions to have extra needed javascript functionality my $catalogmodefunctions=''; if ($env{'form.catalogmode'} eq 'interactive' or - $env{'form.catalogmode'} eq 'groupimport') { + $env{'form.catalogmode'} eq 'import') { # The if statement below sets us up to use the old version # by default (ie. if $mode is undefined). This is the easy # way out. Hopefully in the future I'll find a way to get @@ -242,7 +247,7 @@ END # # if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) { - my $location = "/adm/groupsort?catalogmode=groupimport&"; + my $location = "/adm/groupsort?&inhibitmenu=yes&catalogmode=import&"; $location .= "mode=".$mode."&"; $location .= "acts="; $catalogmodefunctions=<<"END"; @@ -269,6 +274,9 @@ END function select_data(url) { var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url; window.location=location; + if (window.opener.document.forms["$form"].elements["$element"].value != url) { + window.opener.unClean(); + } } function select_group() { window.location="$location"+document.forms.fileattr.acts.value; @@ -329,7 +337,7 @@ function rep_dirpath(suffix,val) { eval("document.forms.dirpath"+suffix+".acts.value=val"); } END - if ($env{'form.catalogmode'} eq 'groupimport') { + if ($env{'form.catalogmode'} eq 'import') { $catalogmodefunctions.=<print(< -The LearningOnline Network With CAPA Directory Browser - - - + + my $js = <<"ENDHEADER"; - - ENDHEADER -my ($headerdom)=($uri=~/^\/res\/(\w+)\//); -$r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef, - $headerdom)); -# - Evaluate actions from previous page (both cumulatively and chronologically) - if ($env{'form.catalogmode'} eq 'groupimport') { - my $acts=$env{'form.acts'}; - my @Acts=split(/b/,$acts); - my %ahash; - my %achash; - my $ac=0; - # some initial hashes for working with data - foreach (@Acts) { - my ($state,$ref)=split(/a/); - $ahash{$ref}=$state; - $achash{$ref}=$ac; - $ac++; - } - # sorting through the actions and changing the global database hash - foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) { - my $key=$_; - if ($ahash{$key} eq '1') { - $hash{'store_'.$hash{'pre_'.$key.'_link'}}= - $hash{'pre_'.$key.'_title'}; - $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}= - $hash{'storectr'}+0; - $hash{'storectr'}++; - } - if ($ahash{$key} eq '0') { - if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) { - delete $hash{'store_'.$hash{'pre_'.$key.'_link'}}; - } - } - } - # deleting the previously cached listing - foreach (keys %hash) { - if ($_ =~ /^pre_/ && $_ =~/link$/) { - my $key = $_; - $key =~ s/^pre_//; - $key =~ s/_[^_]*$//; - delete $hash{'pre_'.$key.'_title'}; - delete $hash{'pre_'.$key.'_link'}; - } - } + + my ($headerdom)=($uri=~m{^/res/($match_domain)/}); + $r->print(&Apache::loncommon::start_page('Browse Resources',$js, + {'domain' => $headerdom,})); +# ---------------------------------- get state of file types to be showing + if ($env{'form.only'}) { + $typeselect = $env{'form.only'}; + } else { + $typeselect = ''; } - + # ---------------------------------- get state of file attributes to be showing if ($env{'form.attrs'}) { for (my $i=0; $i<=11; $i++) { @@ -451,7 +447,10 @@ $r->print(&Apache::loncommon::bodytag('B 'sr' => 'Show resource', 'li' => 'Linked/Related Resources', 'av' => 'All versions', - 'ud' => 'Update Display' + 'ud' => 'Update Display', + 'pr' => 'Problems', + 'gr' => 'Graphics', + 'at' => 'All types' ); $r->print(<print(&Apache::loncommon::bodytag('B +END + my @file_categories = &Apache::loncommon::filecategories(); + my %select_file_categories; + my @select_form_order = (''); + $select_file_categories{''} = 'All file types'; + foreach my $cat (@file_categories) { + my $types = join(",",&Apache::loncommon::filecategorytypes($cat)); + $select_file_categories{$types} = $cat; + push(@select_form_order,$types); + } + $select_file_categories{'select_form_order'} = \@select_form_order; + my $type_element= + &Apache::loncommon::select_form($typeselect,'only', + %select_file_categories); + $type_element = ''; + $r->print(< $closebutton $groupimportbutton END + $r->print(&Apache::loncommon::inhibit_menu_check('input')); + # -------------- Filter out sequence containment in crumbs and "recent folders" my $storeuri=$uri; $storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; $storeuri=~s/\/+/\//g; # ---------------------------------------------------------------- Bread crumbs $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','', - (($env{'form.catalogmode'} eq 'groupimport')? + (($env{'form.catalogmode'} eq 'import')? 'document.forms.fileattr':'')). &Apache::lonhtmlcommon::select_recent('residx','resrecent', 'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();')); @@ -496,8 +516,8 @@ END my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'}; if ($reshome) { $r->print("print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();'); + if ($env{'form.catalogmode'} eq 'import') { + $r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();'); } else { $r->print($reshome); } @@ -507,6 +527,11 @@ END # ------------------------------------------------------ Remember where we were &Apache::loncommon::storeresurl($storeuri); &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); +# -------------------------------------------------- Check All and Uncheck all + if ($env{'form.catalogmode'} eq 'import') { + $r->print('
'); + $r->print(''); + } # ----------------- output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; #$r->print(&initdebug()); @@ -589,16 +614,17 @@ END # -------- recursively go through all the directories and output as appropriate &scanDir ($r,$toplevel,$indent,\%hash); -# ---------------------------- embed hidden information useful for group import - $r->print("
"); - $r->print("
"); # -------------------------------------------------------------- end the tables $r->print(''); +# ---------------------------- embed hidden information useful for group import + $r->print("
"); + $r->print("
"); +# -------------------------------------------------------------- end the tables $r->print(''); # --------------------------------------------------- end the output and return - $r->print(''."\n"); + $r->print(&Apache::loncommon::end_page()."\n"); } if(! $c->aborted()) { # write back into the temporary file @@ -687,7 +713,7 @@ sub get_list { $uri=~s/\/+/\//g; foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) { my @ratpart=split(/\:/,$_); - push @list,$ratpart[1]; + push(@list,&LONCAPA::map::qtescape($ratpart[1])); } $hash{'dirlist_files_'.$luri} = join("\n",@list); } else { @@ -696,7 +722,7 @@ sub get_list { $hash{'dirlist_files_'.$luri} = join("\n",@list); $hash{'dirlist_timestamp_files_'.$luri} = time; } - return @list=&match_ext($r,@list); + return @list=&match_ext($r,@list); } sub dynmetaread { @@ -714,16 +740,19 @@ sub dynmetaread { } # Actually get the data %dynhash= - (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri)); + (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri.'/')); # Remember that we got it $dynread{$uri}=1; } } sub initdebug { - my $html=&Apache::lonxml::xmlbegin(); + my $start_page= + &Apache::loncommon::start_page('Debug',undef, + {'only_body' => 1,}); + $start_page =~ s/\n/ /g; return < + ENDJS } sub writedebug { - my $text = shift; - return ""; + my ($text) = @_; + return ""; } # -------------------- filters out files based on extensions (returns an array) @@ -803,7 +832,8 @@ sub display_line { my $i=0; while ($i<=11) { $tabtag=join('',$tabtag," ") - if $hash{'display_attrs_'.$i} == 1; + if ($i != 9 && + $hash{'display_attrs_'.$i} == 1); $i++; } my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom'); @@ -815,7 +845,7 @@ sub display_line { $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1]; $updir=~s/\/+/\//g; - $r->print("$extrafield"); + $r->print("$extrafield"); $r->print("\n"); $r->print ('
'."\n"); + $r->print(&Apache::loncommon::inhibit_menu_check('input')); $r->print (''."\n"); $r->print (''."\n"); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); - $r->print(&mt("Up")."
$tabtag\n"); + $r->print(&mt("Up")."$tabtag\n"); return OK; } # Do we have permission to look at this? @@ -843,50 +874,49 @@ sub display_line { if ($filecom[1] eq 'domain') { $r->print (''."\n") if ($env{'form.dirPointer'} eq "on"); - $r->print("$extrafield"); + $r->print("$extrafield"); $r->print(""); &begin_form ($r,$filecom[0]); my $anchor = $filecom[0]; - $anchor =~ s/\///g; - $r->print (''); + $anchor =~ s/\W//g; + $r->print (''); $r->print (''); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]); $r->print ('print (' border="0" />'."\n"); + '\')">print (' class="LC_icon" />'."\n"); $r->print (&mt("Domain")." - $listname "); - if ($Apache::lonnet::domaindescription{$listname}) { - $r->print("(".$Apache::lonnet::domaindescription{$listname}. + if (&Apache::lonnet::domain($listname,'description')) { + $r->print("(".&Apache::lonnet::domain($listname,'description'). ")"); } - $r->print (" $tabtag\n"); + $r->print ("$tabtag\n"); return OK; # display user directory } if ($filecom[1] eq 'user') { - $r->print("$extrafield"); - $r->print("\n"); + # $r->print("$extrafield"); my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; - $anchor =~ s/\///g; + $anchor =~ s/\W//g; + $r->print("$extrafield"); &begin_form ($r,$curdir); - $r->print (''."\n"); + $r->print (''."\n"); $r->print (''); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print (''); + .'\')">'.$msg.''); my $domain=(split(m|/|,$startdir))[2]; my $plainname=&Apache::loncommon::plainname($listname,$domain); $r->print ($listname); @@ -897,7 +927,11 @@ sub display_line { # display file if (($fnptr == 0 and $filecom[3] ne '') or $absolute) { + my $title; my $filelink = $pathprefix.$filecom[0]; + if ($hash{'display_attrs_0'} == 1) { + $title = &Apache::lonnet::gettitle($filelink); + } my @file_ext = split (/\./,$listname); my $curfext = $file_ext[-1]; if (@Omit) { @@ -910,17 +944,17 @@ sub display_line { } # Set the icon for the file my $iconname = &Apache::loncommon::icon($listname); - $r->print(""); + $r->print(""); if ($env{'form.catalogmode'} eq 'interactive') { my $quotable_filelink = &Apache::loncommon::escape_single($filelink); $r->print(""); - $r->print("". + $r->print("\"\"". "\n"); - $r->print(""); - } elsif ($env{'form.catalogmode'} eq 'groupimport') { - $r->print("
\n"); + $r->print(""); + } elsif ($env{'form.catalogmode'} eq 'import') { + $r->print("\n"); $r->print("print("checked"); } $r->print(" />\n"); - $r->print("
\n"); - $r->print(""); + $r->print(""); $hash{"pre_${fnum}_link"}=$filelink; + $hash{"pre_${fnum}_title"}=$title; + if (!$hash{"pre_${fnum}_title"}) { + $hash{"pre_${fnum}_title"} = 'Not_retrieved'; + } $fnum++; } # Form to open or close sequences if ($filelink=~/\.(page|sequence)$/) { my $curdir = $startdir.$filecom[0].'/'; - my $anchor = $curdir; - $anchor =~ s/\///g; &begin_form($r,$curdir); $indent--; } # General indentation if ($indent > 0 and $indent < 11) { - $r->print("\n"); + $r->print("\"\"\n"); } elsif ($indent >0) { my $ten = int($indent/10.); my $rem = $indent%10.0; my $count = 0; while ($count < $ten) { - $r->print("\n"); + $r->print("\"\"\n"); $count++; } - $r->print("\n") if $rem > 0; + $r->print("\"\"\n") if $rem > 0; } # Sequence open/close icon if ($filelink=~/\.(page|sequence)$/) { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; - $anchor =~ s/\///g; + $anchor =~ s/\W//g; $r->print (''); - $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); } # Filetype icons - $r->print("\n"); -# Close form to open/close sequence - if ($filelink=~/\.(page|sequence)$/) { - $r->print(''); - } + $r->print("\"\"\n"); my $quotable_filelink = &Apache::loncommon::escape_single($filelink); - $r->print (" $listname "); - + "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"". + " target=\"_self\">$listname "); + $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta'); + &Apache::loncommon::inhibit_menu_check(\$quotable_filelink); $r->print (" (metadata) "); + "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ". + " target=\"_self\">metadata) "); +# Close form to open/close sequence + if ($filelink=~/\.(page|sequence)$/) { + $r->print(''); + } $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { - my $title = &Apache::lonnet::gettitle($filelink,'title'); $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } @@ -1042,10 +1076,11 @@ sub display_line { if($source eq 'open') { my $sourcelink = &Apache::lonsource::make_link($filelink,$listname); my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink); + &Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink); $r->print(''."Yes "."\n"); + "', 'previewsource', '700', '700', 'no', 'yes','yes');\"". + " target=\"_self\">Yes "."\n"); } else { #A cuddled else. :P $r->print(" \n"); } @@ -1054,39 +1089,18 @@ sub display_line { # links &dynmetaread($filelink); $r->print(''); + &coursecontext($r,$filelink); &dynmetaprint($r,$filelink,'goto_list'); &dynmetaprint($r,$filelink,'comefrom_list'); &dynmetaprint($r,$filelink,'sequsage_list'); &dynmetaprint($r,$filelink,'dependencies'); + &dynmetaprint($r,$filelink,'course_list'); $r->print(''); } if ($hash{'display_attrs_7'} == 1) { # Show resource - my $output=''; - my $embstyle=&Apache::loncommon::fileembstyle($curfext); - if ($embstyle eq 'ssi') { - my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink. - '.tmp'; - if ((!$env{'form.updatedisplay'}) && - (-e $cache)) { - open(FH,$cache); - $output=join("\n",); - close(FH); - } else { - $output=&Apache::lonnet::ssi_body($filelink); - open(FH,">$cache"); - print FH $output; - close(FH); - } - $output=''.$output.''; - } elsif ($embstyle eq 'img') { - $output=''; - } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) { - $output=''; - } - $r->print(' '.($output eq '' ? ' ':$output). + my $output=&showpreview($filelink); + $r->print(' '.($output eq '' ? ' ':$output). " \n"); } $r->print("\n"); @@ -1096,41 +1110,42 @@ sub display_line { if ($fnptr == $dirptr) { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; - $anchor =~ s/\///g; - $r->print("$extrafield"); + $anchor =~ s/\W//g; + $r->print("$extrafield"); &begin_form ($r,$curdir); my $indentm1 = $indent-1; if ($indentm1 < 11 and $indentm1 > 0) { - $r->print("\n"); + $r->print("\"\"\n"); } else { my $ten = int($indentm1/10.); my $rem = $indentm1%10.0; my $count = 0; while ($count < $ten) { - $r->print ("\n"); + $r->print ("\"\"\n"); $count++; } - $r->print ("\n") if $rem > 0; + $r->print ("\"\"\n") if $rem > 0; } $r->print (''); - $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print (''. + .$quotable_curdir.'\')">' + .''.&mt('Open Folder').''. "\n"); - $r->print ("$listname\n"); + $r->print ("$listname\n"); # Attributes my $filelink = $startdir.$filecom[0].'/default'; if ($hash{'display_attrs_0'} == 1) { - my $title = &Apache::lonnet::gettitle($filelink,'title'); + my $title = &Apache::lonnet::gettitle($filelink); $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } @@ -1173,9 +1188,64 @@ sub display_line { if ($hash{'display_attrs_7'} == 1) { $r->print(' '); } - $r->print(''); + $r->print(''); + } + +} + +sub coursecontext { + my ($r,$filelink)=@_; + my $filesymb=&Apache::lonnet::symbread($filelink); + if ($filesymb) { + my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb); + $r->print(&mt('Already in this course:
[_1] in folder/map [_2].
', + &Apache::lonnet::gettitle($resource), + &Apache::lonnet::gettitle($map))); } +} +sub showpreview { + my ($filelink)=@_; + if ($filelink=~m-^(/ext/|http://)-) { + return &mt('External Resource, preview not enabled'); + } + my ($curfext)=($filelink=~/\.(\w+)$/); + my $output=''; + my $embstyle=&Apache::loncommon::fileembstyle($curfext); + if ($embstyle eq 'ssi') { + my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink. + '.tmp'; + if ((!$env{'form.updatedisplay'}) && + (-e $cache)) { + open(FH,$cache); + $output=join("\n",); + close(FH); + } else { +# In update display mode, remove old cache. This is done to retroactively +# clean up course context renderings. + if (-e $cache) { + unlink($cache); + } + $output=&Apache::lonnet::ssi_body($filelink); +# Is access denied? Don't render, don't store + if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) { + $output=''; +# Was this rendered in course content? Don't store + } elsif (!&Apache::lonnet::symbread($filelink)) { + open(FH,">$cache"); + print FH $output; + close(FH); + } + } + $output=''.$output.''; + } elsif ($embstyle eq 'img') { + $output=''.&mt('Preview').''; + } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) { + $output=''.&mt('Preview').''; + } + return $output; } sub dynmetaprint { @@ -1184,9 +1254,9 @@ sub dynmetaprint { $r->print("\n
".$fieldnames{$item}.': '. &Apache::lonmeta::prettyprint($item, $dynhash{$filelink}->{$item}, - (($env{'form.catalogmode'} ne 'groupimport')?'preview':''), + (($env{'form.catalogmode'} ne 'import')?'preview':''), '', - (($env{'form.catalogmode'} eq 'groupimport')?'document.forms.fileattr':''),1)); + (($env{'form.catalogmode'} eq 'import')?'document.forms.fileattr':''),1)); } } @@ -1194,7 +1264,8 @@ sub dynmetaprint { sub begin_form { my ($r,$uri) = @_; my $anchor = $uri; - $anchor =~ s/\///g; + $anchor =~ s/\W//g; + $uri=&Apache::loncommon::escape_single($uri); $r->print ('
'. "\n"); $r->print (''."\n"); + $r->print(&Apache::loncommon::inhibit_menu_check('input')); $dnum++; } # --------- settings whenever the user causes the indexer window to be launched sub start_fresh_session { - delete $hash{'form.catalogmode'}; - delete $hash{'form.mode'}; - delete $hash{'form.form'}; - delete $hash{'form.element'}; - delete $hash{'form.omit'}; - delete $hash{'form.only'}; - foreach (keys %hash) { - delete $hash{$_} if (/^(pre_|store)/); + my ($hash) = @_; + delete $hash->{'form.catalogmode'}; + delete $hash->{'form.mode'}; + delete $hash->{'form.form'}; + delete $hash->{'form.element'}; + delete $hash->{'form.omit'}; + delete $hash->{'form.only'}; + foreach (keys %{$hash}) { + delete $hash->{$_} if (/^(pre_|store)/); } } @@ -1238,6 +1311,7 @@ sub cleanup { if (tied(%hash)){ &Apache::lonnet::logthis('Cleanup indexer: hash'); } + return OK; }