--- loncom/interface/londocs.pm 2003/02/25 19:30:51 1.50
+++ loncom/interface/londocs.pm 2003/09/08 19:21:10 1.75
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.50 2003/02/25 19:30:51 www Exp $
+# $Id: londocs.pm,v 1.75 2003/09/08 19:21:10 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,6 +35,7 @@ use Apache::loncommon;
use Apache::lonratedt;
use Apache::lonratsrv;
use Apache::lonxml;
+use Apache::loncreatecourse;
use HTML::Entities;
use GDBM_File;
@@ -72,6 +73,91 @@ sub storemap {
$map,1);
}
+# ----------------------------------------- Return hash with valid author names
+
+sub authorhosts {
+ my %outhash=();
+ my $home=0;
+ my $other=0;
+ foreach (keys %ENV) {
+ if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {
+ my $role=$1;
+ my $realm=$2;
+ my ($start,$end)=split(/\./,$ENV{$_});
+ if (($start) && ($start>time)) { next; }
+ if (($end) && (time>$end)) { next; }
+ my $ca; my $cd;
+ if ($1 eq 'au') {
+ $ca=$ENV{'user.name'};
+ $cd=$ENV{'user.domain'};
+ } else {
+ ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
+ }
+ if (&Apache::lonnet::homeserver($ca,$cd) eq
+ $Apache::lonnet::perlvar{'lonHostID'}) {
+ $home++;
+ $outhash{'home_'.$ca.'@'.$cd}=1;
+ } else {
+ $outhash{'otherhome_'.$ca.'@'.$cd}=
+ &Apache::lonnet::homeserver($ca,$cd);
+ $other++;
+ }
+ }
+ }
+ return ($home,$other,%outhash);
+}
+# ------------------------------------------------------ Generate "dump" button
+
+sub dumpbutton {
+ my ($home,$other,%outhash)=&authorhosts();
+ if ($home+$other==0) { return ''; }
+ my $output='| ';
+ if ($home) {
+ return ' | '.
+ '';
+ } else {
+ return' | '.
+ 'Dump Course DOCS to Construction Space: available on other servers';
+ }
+}
+
+# -------------------------------------------------------- Actually dump course
+
+sub dumpcourse {
+ my $r=shift;
+ $r->print('Dump DOCS'.
+ &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space'));
+ my ($home,$other,%outhash)=&authorhosts();
+ unless ($home) { return ''; }
+ if ($ENV{'form.authorspace'}) {
+ unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; }
+ my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
+ }
+}
+
+# Imports the given (name, url) resources into the course
+# coursenum, coursedom, and folder must precede the list
+sub group_import {
+ my $coursenum = shift;
+ my $coursedom = shift;
+ my $folder = shift;
+ while (@_) {
+ my $name = shift;
+ my $url = shift;
+ if ($url) {
+ my $idx = $#Apache::lonratedt::resources + 1;
+ $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
+ my $ext = 'false';
+ if ($url=~/^http:\/\//) { $ext = 'true'; }
+ $url =~ s/:/\:/g;
+ $name =~ s/:/\:/g;
+ $Apache::lonratedt::resources[$idx] =
+ join ':', ($name, $url, $ext, 'normal', 'res');
+ }
+ }
+ &storemap($coursenum, $coursedom, $folder);
+}
+
sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
if ($ENV{'form.foldername'}) {
@@ -158,27 +244,32 @@ sub editor {
}
# Group import/search
if ($ENV{'form.importdetail'}) {
- foreach (split(/\&/,$ENV{'form.importdetail'})) {
- if (defined($_)) {
- my ($name,$url)=split(/\=/,$_);
- $name=&Apache::lonnet::unescape($name);
- $url=&Apache::lonnet::unescape($url);
- if ($url) {
- my $idx=$#Apache::lonratedt::resources+1;
- $Apache::lonratedt::order
- [$#Apache::lonratedt::order+1]=$idx;
- my $ext='false';
- if ($url=~/^http\:\/\//) { $ext='true'; }
- $url=~s/\:/\:/g;
- $name=~s/\:/\:/g;
- $Apache::lonratedt::resources[$idx]=
- $name.':'.$url.':'.$ext.':normal:res';
- }
- }
- }
+ my @imports;
+ foreach (split(/\&/,$ENV{'form.importdetail'})) {
+ if (defined($_)) {
+ my ($name,$url)=split(/\=/,$_);
+ $name=&Apache::lonnet::unescape($name);
+ $url=&Apache::lonnet::unescape($url);
+ push @imports, $name, $url;
+ }
+ }
# Store the changed version
- &storemap($coursenum,$coursedom,$folder.'.sequence');
+ group_import($coursenum, $coursedom, $folder, @imports);
}
+# Loading a complete map
+ if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
+ foreach
+(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+ my $idx=$#Apache::lonratedt::resources;
+ $idx++;
+ $Apache::lonratedt::resources[$idx]=$_;
+ $Apache::lonratedt::order
+ [$#Apache::lonratedt::order+1]=$idx;
+ }
+
+# Store the changed version
+ &storemap($coursenum,$coursedom,$folder.'.sequence');
+ }
}
# ---------------------------------------------------------------- End commands
# ---------------------------------------------------------------- Print screen
@@ -218,16 +309,18 @@ sub entryline {
# Edit commands
if ($allowed) {
$line.=(< |
+
+Remove
-Rename |
+Rename
END
}
# Figure out what kind of a resource this is
@@ -249,7 +342,7 @@ END
}
}
$url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
- if ($residx) {
+ if (($residx) && ($folder!~/supplemental/)) {
$url.=(($url=~/\?/)?'&':'?').'symb='.
&Apache::lonnet::escape(&Apache::lonnet::symbclean(
&Apache::lonnet::declutter('uploaded/'.
@@ -313,9 +406,12 @@ sub checkonthis {
$r->print(' ');
}
$r->print('- Rendering: ');
+ my $oldpath=$ENV{'request.filename'};
+ $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url);
&Apache::lonxml::xmlparse($r,'web',
&Apache::lonnet::getfile(
&Apache::lonnet::filelocation('',$url)));
+ $ENV{'request.filename'}=$oldpath;
if (($Apache::lonxml::errorcount) ||
($Apache::lonxml::warningcount)) {
if ($Apache::lonxml::errorcount) {
@@ -349,24 +445,12 @@ sub checkonthis {
}
}
-# ================================================================ Main Handler
-sub handler {
- my $r = shift;
- $r->content_type('text/html');
- $r->send_http_header;
- return OK if $r->header_only;
-# --------------------------------------------- Initialize help topics for this
- foreach ('Adding_Course_Doc','Main_Course_Documents',
- 'Adding_External_Resource','Navigate_Content',
- 'Adding_Folders','Docs_Overview',
- 'Creating_From_Template','Supplemental',
- 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
- $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
- }
-
- if ($ENV{'form.verify'}) {
-
+#
+# -------------------------------------------------------------- Verify Content
+#
+sub verifycontent {
+ my $r=shift;
my $loaderror=&Apache::lonnet::overloaderror($r);
if ($loaderror) { return $loaderror; }
@@ -382,8 +466,14 @@ sub handler {
}
}
&untiehash();
- } elsif ($ENV{'form.versions'}) {
- $r->print('Check Versions'.
+ $r->print('Done.
');
+}
+
+# -------------------------------------------------------------- Check Versions
+
+sub checkversions {
+ my $r=shift;
+ $r->print('Check Versions'.
&Apache::loncommon::bodytag('Check Course Document Versions'));
$hashtied=0;
&tiehash();
@@ -416,7 +506,7 @@ sub handler {
$seltext='since yesterday ('.localtime($starttime).')';
$daysel='selected';
}
-
+
$r->print(<
