[LON-CAPA-cvs] cvs: loncom /interface groupsort.pm lonindexer.pm lonsearchcat.pm
www
lon-capa-cvs@mail.lon-capa.org
Thu, 08 Jun 2006 07:20:42 -0000
www Thu Jun 8 03:20:42 2006 EDT
Modified files:
/loncom/interface groupsort.pm lonindexer.pm lonsearchcat.pm
Log:
Clean up: no need for three database files.
Next step: being able to flip back and forth between import and search
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.41 loncom/interface/groupsort.pm:1.42
--- loncom/interface/groupsort.pm:1.41 Sun Mar 26 14:44:45 2006
+++ loncom/interface/groupsort.pm Thu Jun 8 03:20:41 2006
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.41 2006/03/26 19:44:45 banghart Exp $
+# $Id: groupsort.pm,v 1.42 2006/06/08 07:20:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,55 +45,9 @@
sub readfromdb {
my ($r,$shash,$thash)=@_;
- my $diropendb;
-# ------------------------------ which file do we open? Easy if explictly given
- if ($env{'form.catalogmode'} eq 'groupsearch') {
- $diropendb =
- "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";
- } elsif ($env{'form.catalogmode'} eq 'groupimport') {
- $diropendb =
- "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
- } elsif ($env{'form.catalogmode'} eq 'groupsec') {
- $diropendb =
- "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
- } else {
-# --------------------- not explicitly given, choose the one most recently used
- my @dbfn;
- my @dbst;
-
- $dbfn[0] =
- "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";
- $dbst[0]=-1;
- if (-e $dbfn[0]) {
- $dbst[0]=(stat($dbfn[0]))[9];
- }
- $dbfn[1] =
- "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
- $dbst[1]=-1;
- if (-e $dbfn[1]) {
- $dbst[1]=(stat($dbfn[1]))[9];
- }
- $dbfn[2] =
- "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
- $dbst[2]=-1;
- if (-e $dbfn[2]) {
- $dbst[2]=(stat($dbfn[2]))[9];
- }
-# Expand here for more modes
-# ....
-
-# Okay, find most recent existing
+ my $diropendb =
+ "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
- my $newest=0;
- $diropendb='';
- for (my $i=0; $i<=$#dbfn; $i++) {
- if ($dbst[$i]>$newest) {
- $newest=$dbst[$i];
- $diropendb=$dbfn[$i];
- }
- }
-
- }
# ----------------------------- diropendb is now the filename of the db to open
if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
my $acts = $env{'form.acts'};
@@ -110,8 +64,6 @@
foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
my $key = $_;
if ($ahash{$key} eq '1') {
-# my $keyz=join("<br />",keys %hash);
-# print "<br />$key<br />$keyz".$hash{'pre_'.$key.'_link'}."<br />\n";
$hash{'store_'.$hash{'pre_'.$key.'_link'}} =
$hash{'pre_'.$key.'_title'};
$hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
@@ -244,7 +196,7 @@
my $r = shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['acts','catalogmode','mode','readfile','recover']);
+ ['acts','mode','readfile','recover']);
# color scheme
my $fileclr = '#ffffe6';
my $titleclr = '#ddffff';
@@ -350,8 +302,8 @@
if (($clen > 1) || ($env{'form.readfile'})) {
my %lt=&Apache::lonlocal::texthash(
'fin'=> 'Finalize order of resources',
- 'gb' => 'Go Back',
- 'ns' => 'New Search',
+ 'ci' => 'Continue Import',
+ 'cs' => 'Continue Search',
'fi' => 'Finish Import',
'ca' => 'Cancel',
'co' => 'Change Order',
@@ -373,20 +325,14 @@
<input type="hidden" name="recover" value="$env{'form.recover'}" />
END
- # --- Expand here if "GO BACK" button desired
- if ($env{'form.catalogmode'} eq 'groupimport') {
- my $resurl = &Apache::loncommon::lastresurl();
- $r->print(<<END);
-<input type="button" name="alter" value="$lt{'gb'}"
- onClick="window.location='$resurl?catalogmode=groupimport'" />
+ # --- Continue Buttons
+ my $resurl = &Apache::loncommon::lastresurl();
+ $r->print(<<END);
+<input type="button" name="alter" value="$lt{'ci'}"
+ onClick="window.location='$resurl'" />
+<input type="button" name="altersearch" value="$lt{'cs'}"
+ onClick="window.location='/adm/searchcat'" />
END
- }
- if ($env{'form.catalogmode'} eq 'groupsearch') {
- $r->print(<<END);
-<input type="button" name="alter" value="$lt{'ns'}"
- onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />
-END
- }
# ---
$r->print(<<END);
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.143 loncom/interface/lonindexer.pm:1.144
--- loncom/interface/lonindexer.pm:1.143 Wed May 31 12:22:10 2006
+++ loncom/interface/lonindexer.pm Thu Jun 8 03:20:41 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.143 2006/05/31 16:22:10 www Exp $
+# $Id: lonindexer.pm,v 1.144 2006/06/08 07:20:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -119,7 +119,7 @@
$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;
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.265 loncom/interface/lonsearchcat.pm:1.266
--- loncom/interface/lonsearchcat.pm:1.265 Tue May 30 08:46:09 2006
+++ loncom/interface/lonsearchcat.pm Thu Jun 8 03:20:41 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.265 2006/05/30 12:46:09 www Exp $
+# $Id: lonsearchcat.pm,v 1.266 2006/06/08 07:20:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -155,7 +155,7 @@
##
my $domain = $r->dir_config('lonDefDomain');
$diropendb= "/home/httpd/perl/tmp/".
- "$env{'user.domain'}_$env{'user.name'}_searchcat.db";
+ "$env{'user.domain'}_$env{'user.name'}_sel_res.db";
#
# set the name of the persistent database
# $env{'form.persistent_db_id'} can only have digits in it.