[LON-CAPA-cvs] cvs: loncom /interface groupsort.pm
www
lon-capa-cvs@mail.lon-capa.org
Thu, 09 Jun 2005 22:06:11 -0000
This is a MIME encoded message
--www1118354771
Content-Type: text/plain
www Thu Jun 9 18:06:11 2005 EDT
Modified files:
/loncom/interface groupsort.pm
Log:
Cleanup - stuffing all db-file reading into subroutine
--www1118354771
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20050609180611.txt"
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.32 loncom/interface/groupsort.pm:1.33
--- loncom/interface/groupsort.pm:1.32 Wed Jun 8 17:13:05 2005
+++ loncom/interface/groupsort.pm Thu Jun 9 18:06:09 2005
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.32 2005/06/08 21:13:05 www Exp $
+# $Id: groupsort.pm,v 1.33 2005/06/09 22:06:09 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,9 +26,6 @@
#
# http://www.lon-capa.org/
#
-# YEAR=2001
-# YEAR=2002
-#
###
package Apache::groupsort;
@@ -41,128 +38,26 @@
use Apache::lonlocal;
use Apache::lonnet;
-my %hash; # variable to tie to user specific database
my $iconpath; # variable to be accessible to multiple subroutines
+my %hash; # variable to tie to user specific database
-sub cleanup {
- if (tied(%hash)){
- &Apache::lonnet::logthis('Cleanup groupsort: hash');
- unless (untie(%hash)) {
- &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
- }
- }
-}
-
-# ---------------------------------------------------------------- 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';
-
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- return OK if $r->header_only;
-
-# finish_import looks different for graphical or "simple" RAT
- my $finishimport='';
- if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') {
- $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.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++) {
- insertRowInLastRow();
- placeResourceInLastRow(
- eval("document.forms.groupsort.title"+num+".value"),
- eval("document.forms.groupsort.filelink"+num+".value"),
- linkflag
- );
- linkflag=true;
- }
- opener.editmode=0;
- opener.notclear=0;
- opener.linkmode=0;
- opener.draw();
- self.close();
-}
-ENDADV
- }
-
-# output start of web page
- my $html=&Apache::lonxml::xmlbegin();
- $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.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),
- opener.escape(url),'false','normal');
- opener.save();
- if (linkflag) {
- opener.joinres(opener.linkmode,opener.mostrecent,0);
- }
- opener.linkmode=opener.mostrecent;
-}
-$finishimport
-function selectchange(val) {
- var newval=0+eval("document.forms.groupsort.alt"+val+".selectedIndex");
- orderchange(val,newval);
-}
-function move(val,newval) {
- orderchange(val,newval);
-}
-function orderchange(val,newval) {
- document.forms.groupsort.oldval.value=val;
- document.forms.groupsort.newval.value=newval;
- document.forms.groupsort.submit();
-}
-</script>
-</head>
-END
- # read pertinent machine configuration
- my $domain = $r->dir_config('lonDefDomain');
- $iconpath = $r->dir_config('lonIconsURL') . "/";
- my %shash; # sort order (key is resource location, value is sort order)
- my %thash; # title (key is resource location, value is title)
+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') {
+ } 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') {
+ } 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
- else { # choose last accessed
my @dbfn;
my @dbst;
@@ -233,21 +128,21 @@
if ($_ =~ /^store_/) {
my $key = $_;
$key =~ s/^store_//;
- $shash{$key} = $hash{'storectr_'.$key};
+ $$shash{$key} = $hash{'storectr_'.$key};
if (&Apache::lonnet::gettitle($key) eq '') {
- $thash{$key} = $hash{'store_'.$key};
+ $$thash{$key} = $hash{'store_'.$key};
} else {
- $thash{$key} = &Apache::lonnet::gettitle($key);
+ $$thash{$key} = &Apache::lonnet::gettitle($key);
}
}
}
if ($env{'form.oldval'}) {
my $newctr = 0;
my %chash;
- foreach (sort {$shash{$a} <=> $shash{$b}} (keys %shash)) {
+ foreach (sort {$$shash{$a} <=> $$shash{$b}} (keys %{$shash})) {
my $key = $_;
$newctr++;
- $shash{$key} = $newctr;
+ $$shash{$key} = $newctr;
$hash{'storectr_'.$key} = $newctr;
$chash{$newctr} = $key;
}
@@ -256,32 +151,29 @@
if ($oldval != $newval) {
# when newval==0, then push down and delete
if ($newval!=0) {
- $shash{$chash{$oldval}} = $newval;
+ $$shash{$chash{$oldval}} = $newval;
$hash{'storectr_'.$chash{$oldval}} = $newval;
- }
- else {
- $shash{$chash{$oldval}} = $newctr;
+ } 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;
+ $$shash{$chash{$idx+1}} = $idx;
$hash{'storectr_'.$chash{$idx+1}} = $idx;
}
- delete $shash{$chash{$oldval}};
+ delete $$shash{$chash{$oldval}};
delete $hash{'storectr_'.$chash{$oldval}};
delete $hash{'store_'.$chash{$oldval}};
- }
- elsif ($oldval < $newval) { # push down
+ } elsif ($oldval < $newval) { # push down
for my $idx ($oldval..($newval-1)) {
- $shash{$chash{$idx+1}} = $idx;
+ $$shash{$chash{$idx+1}} = $idx;
$hash{'storectr_'.$chash{$idx+1}} = $idx;
}
- }
- elsif ($oldval > $newval) { # push up
+ } elsif ($oldval > $newval) { # push up
for my $idx (reverse($newval..($oldval-1))) {
- $shash{$chash{$idx}} = $idx+1;
+ $$shash{$chash{$idx}} = $idx+1;
$hash{'storectr_'.$chash{$idx}} = $idx+1;
}
}
@@ -292,6 +184,116 @@
return OK;
}
untie %hash;
+ return ($shash,$thash);
+}
+
+
+
+sub cleanup {
+ if (tied(%hash)){
+ &Apache::lonnet::logthis('Cleanup groupsort: hash');
+ unless (untie(%hash)) {
+ &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
+ }
+ }
+}
+
+# ---------------------------------------------------------------- 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';
+
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ return OK if $r->header_only;
+
+# finish_import looks different for graphical or "simple" RAT
+ my $finishimport='';
+ if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') {
+ $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.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++) {
+ insertRowInLastRow();
+ placeResourceInLastRow(
+ eval("document.forms.groupsort.title"+num+".value"),
+ eval("document.forms.groupsort.filelink"+num+".value"),
+ linkflag
+ );
+ linkflag=true;
+ }
+ opener.editmode=0;
+ opener.notclear=0;
+ opener.linkmode=0;
+ opener.draw();
+ self.close();
+}
+ENDADV
+ }
+
+# output start of web page
+ my $html=&Apache::lonxml::xmlbegin();
+ $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.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),
+ opener.escape(url),'false','normal');
+ opener.save();
+ if (linkflag) {
+ opener.joinres(opener.linkmode,opener.mostrecent,0);
+ }
+ opener.linkmode=opener.mostrecent;
+}
+$finishimport
+function selectchange(val) {
+ var newval=0+eval("document.forms.groupsort.alt"+val+".selectedIndex");
+ orderchange(val,newval);
+}
+function move(val,newval) {
+ orderchange(val,newval);
+}
+function orderchange(val,newval) {
+ document.forms.groupsort.oldval.value=val;
+ document.forms.groupsort.newval.value=newval;
+ document.forms.groupsort.submit();
+}
+</script>
+</head>
+END
+ # read pertinent machine configuration
+ my $domain = $r->dir_config('lonDefDomain');
+ $iconpath = $r->dir_config('lonIconsURL') . "/";
+
+ my %shash; # sort order (key is resource location, value is sort order)
+ my %thash; # title (key is resource location, value is title)
+
+ &readfromdb($r,\%shash,\%thash);
+
my $ctr = 0;
my $clen = scalar(keys %shash);
if ($clen > 1) {
--www1118354771--