--- loncom/interface/lonindexer.pm 2006/07/21 08:25:25 1.149
+++ loncom/interface/lonindexer.pm 2009/05/21 00:36:16 1.181.4.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.149 2006/07/21 08:25:25 albertel Exp $
+# $Id: lonindexer.pm,v 1.181.4.1 2009/05/21 00:36:16 raeburn 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
@@ -127,13 +129,17 @@ sub handler {
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);
+ }
+
{
#Hijack lonindexer to verify a title and be close down.
if ($env{'form.launch'} eq '2') {
@@ -172,8 +178,8 @@ ENDSUBM
# --------------------- define extra fields and buttons in case of special mode
if ($env{'form.catalogmode'} eq 'interactive') {
$extrafield='