--- loncom/interface/groupsort.pm 2001/08/13 14:50:53 1.2
+++ loncom/interface/groupsort.pm 2002/08/16 17:03:23 1.14
@@ -1,11 +1,37 @@
# The LearningOnline Network with CAPA
-#
# The LON-CAPA group sort handler
-#
# Allows for sorting prior to import into RAT.
#
+# $Id: groupsort.pm,v 1.14 2002/08/16 17:03:23 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# YEAR=2001
-# 8/7,8/8 Scott Harrison
+# 8/7,8/8,10/14,10/15,12/10 Scott Harrison
+# YEAR=2002
+# 1/17 Scott Harrison
+#
+###
package Apache::groupsort;
@@ -20,7 +46,9 @@ my $iconpath; # variable to be accessibl
# ---------------------------------------------------------------- Main Handler
sub handler {
my $r = shift;
-
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['acts','catalogmode','mode']);
# color scheme
my $fileclr = '#ffffe6';
my $titleclr = '#ddffff';
@@ -29,26 +57,23 @@ sub handler {
$r->send_http_header;
return OK if $r->header_only;
- # output start of web page
- $r->print(<<END);
-<html>
-<head>
-<title>The LearningOnline Network With CAPA Group Sorter</title>
-<script language='javascript'>
-function insertRowInLastRow() {
- opener.insertrow(opener.maxrow);
- opener.addobj(opener.maxrow,'e&2');
-}
-function placeResourceInLastRow (title,url,linkflag) {
- opener.newresource(opener.maxrow,2,opener.escape(title),
- opener.escape(url),'false','normal');
- opener.save();
- opener.mostrecent=opener.obj.length-1;
- if (linkflag) {
- opener.joinres(opener.linkmode,opener.mostrecent,0);
+# finish_import looks different for graphical or "simple" RAT
+ my $finishimport='';
+ if ($ENV{'form.mode'} eq 'simple') {
+ $finishimport=(<<ENDSMP);
+function finish_import() {
+ opener.document.forms.simpleedit.importdetail.value='';
+ for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+ opener.document.forms.simpleedit.importdetail.value+='&'+
+ escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
+ escape(eval("document.forms.groupsort.filelink"+num+".value"));
}
- opener.linkmode=opener.mostrecent;
+ opener.document.forms.simpleedit.submit();
+ self.close();
}
+ENDSMP
+ } else {
+ $finishimport=(<<ENDADV);
function finish_import() {
var linkflag=false;
for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
@@ -63,12 +88,36 @@ function finish_import() {
opener.editmode=0;
opener.notclear=0;
opener.linkmode=0;
- opener.infoclear();
opener.draw();
self.close();
}
+ENDADV
+ }
+
+# output start of web page
+
+ $r->print(<<END);
+<html>
+<head>
+<title>The LearningOnline Network With CAPA Group Sorter</title>
+<script language='javascript'>
+function insertRowInLastRow() {
+ opener.insertrow(opener.maxrow);
+ opener.addobj(opener.maxrow,'e&2');
+}
+function placeResourceInLastRow (title,url,linkflag) {
+ opener.newresource(opener.maxrow,2,opener.escape(title),
+ opener.escape(url),'false','normal');
+ opener.save();
+ opener.mostrecent=opener.obj.length-1;
+ if (linkflag) {
+ opener.joinres(opener.linkmode,opener.mostrecent,0);
+ }
+ opener.linkmode=opener.mostrecent;
+}
+$finishimport
function selectchange(val) {
- var newval=1+eval("document.forms.groupsort.alt"+val+".selectedIndex");
+ var newval=0+eval("document.forms.groupsort.alt"+val+".selectedIndex");
orderchange(val,newval);
}
function move(val,newval) {
@@ -87,33 +136,80 @@ END
# read pertinent machine configuration
my $domain = $r->dir_config('lonDefDomain');
$iconpath = $r->dir_config('lonIconsURL') . "/";
- my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
my %shash; # sort order (key is resource location, value is sort order)
my %thash; # title (key is resource location, value is title)
- map {
- my ($name, $value) = split(/=/,$_);
- $value =~ tr/+/ /;
- $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- if ($name eq 'acts') {
- $ENV{'form.'.$name}=$value;
- }
- } (split(/&/,$ENV{'QUERY_STRING'}));
- if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+
+ my $diropendb;
+# ------------------------------ which file do we open? Easy if explictly given
+ if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ $diropendb =
+ "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
+ }
+ elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
+ $diropendb =
+ "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+ }
+ elsif ($ENV{'form.catalogmode'} eq 'groupsec') {
+ $diropendb =
+ "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db";
+ }
+# --------------------- not explicitly given, choose the one most recently used
+ else { # choose last accessed
+ my @dbfn;
+ my @dbst;
+
+ $dbfn[0] =
+ "/home/httpd/perl/tmp/$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/$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/$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 $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'};
my @Acts = split(/b/,$acts);
my %ahash;
my %achash;
my $ac = 0;
- map {
+ foreach (@Acts) {
my ($state,$ref) = split(/a/);
$ahash{$ref} = $state;
$achash{$ref} = $ac;
$ac++;
- } (@Acts);
- map {
+ }
+ 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'}} =
@@ -125,31 +221,48 @@ END
delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
}
}
- } sort {$achash{$a} <=> $achash{$b}} (keys %ahash);
- map {
+ }
+ foreach (keys %hash) {
if ($_ =~ /^store_/) {
my $key = $_;
$key =~ s/^store_//;
$shash{$key} = $hash{'storectr_'.$key};
$thash{$key} = $hash{'store_'.$key};
}
- } keys %hash;
+ }
if ($ENV{'form.oldval'}) {
my $newctr = 0;
my %chash;
- map {
+ foreach (sort {$shash{$a} <=> $shash{$b}} (keys %shash)) {
my $key = $_;
$newctr++;
$shash{$key} = $newctr;
$hash{'storectr_'.$key} = $newctr;
$chash{$newctr} = $key;
- } sort {$shash{$a} <=> $shash{$b}} (keys %shash);
+ }
my $oldval = $ENV{'form.oldval'};
my $newval = $ENV{'form.newval'};
if ($oldval != $newval) {
- $shash{$chash{$oldval}} = $newval;
- $hash{'storectr_'.$chash{$oldval}} = $newval;
- if ($oldval < $newval) { # push down
+ # when newval==0, then push down and delete
+ if ($newval!=0) {
+ $shash{$chash{$oldval}} = $newval;
+ $hash{'storectr_'.$chash{$oldval}} = $newval;
+ }
+ else {
+ $shash{$chash{$oldval}} = $newctr;
+ $hash{'storectr_'.$chash{$oldval}} = $newctr;
+ }
+ if ($newval==0) { # push down
+ my $newval2=$newctr;
+ for my $idx ($oldval..($newval2-1)) {
+ $shash{$chash{$idx+1}} = $idx;
+ $hash{'storectr_'.$chash{$idx+1}} = $idx;
+ }
+ delete $shash{$chash{$oldval}};
+ delete $hash{'storectr_'.$chash{$oldval}};
+ delete $hash{'store_'.$chash{$oldval}};
+ }
+ elsif ($oldval < $newval) { # push down
for my $idx ($oldval..($newval-1)) {
$shash{$chash{$idx+1}} = $idx;
$hash{'storectr_'.$chash{$idx+1}} = $idx;
@@ -170,18 +283,35 @@ END
untie %hash;
my $ctr = 0;
my $clen = scalar(keys %shash);
- $r->print('<h2><font color="#888888">The LearningOnline With CAPA '.
- 'Group Sorter</font></h2>'."\n");
- $r->print('<b><font color="#888888">Finalize order of resources</font>'.
- '</b>'."\n");
- $r->print("<form method='post' action='/adm/groupsort' name='groupsort' ".
- "enctype='application/x-www-form-urlencoded'>");
- $r->print(<<END);
+ $r->print(<<END);
+<h2><font color="#888888">
+ The LearningOnline Network With CAPA Group Sorter
+ </font></h2>
+<b><font color="#888888">Finalize order of resources</font></b>
+<form method='post' action='/adm/groupsort' name='groupsort'
+ enctype='application/x-www-form-urlencoded'>
<input type="hidden" name="fnum" value="$clen" />
<input type="hidden" name="oldval" value="" />
<input type="hidden" name="newval" value="" />
+<input type="hidden" name="mode" value="$ENV{'form.mode'}" />
+END
+
+# --- Expand here if "GO BACK" button desired
+ if ($ENV{'form.catalogmode'} eq 'groupimport') {
+ $r->print(<<END);
<input type="button" name="alter" value="GO BACK"
onClick="window.location='/res/?catalogmode=groupimport'" />
+END
+ }
+ if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ $r->print(<<END);
+<input type="button" name="alter" value="GO BACK"
+ onClick="window.location='/adm/searchcat?catalogmode=groupsearch'" />
+END
+}
+# ---
+
+ $r->print(<<END);
<input type="button" name="alter" value="FINISH IMPORT"
onClick="finish_import()" />
<input type="button" name="alter" value="CANCEL" onClick="self.close()" />
@@ -192,7 +322,7 @@ END
"\n");
$r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
$r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
- map {
+ foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
my $key=$_;
$ctr++;
my @file_ext = split(/\./,$key);
@@ -207,7 +337,7 @@ END
$r->print("</td><td bgcolor='$fileclr'>");
$r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
$r->print("$key</td></tr>\n");
- } sort {$shash{$a}<=>$shash{$b}} (keys %shash);
+ }
$r->print("</table></td></tr></table></form>");
$r->print(<<END);
</body>
@@ -251,6 +381,7 @@ sub select_box {
my $string;
$string = '<select name="alt'.$sel.'"';
$string .= " onChange='selectchange($sel)'>";
+ $string .= "<option name='o0' value='0'>remove</option>";
for my $cur (1..$total) {
$string .= "<option name='o$cur' value='$cur'";
if ($cur == $sel) {