--- loncom/interface/londocs.pm	2003/07/15 19:52:47	1.65
+++ loncom/interface/londocs.pm	2003/09/08 18:56:09	1.74
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.65 2003/07/15 19:52:47 bowersj2 Exp $
+# $Id: londocs.pm,v 1.74 2003/09/08 18:56:09 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,86 @@ 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='</td><td bgcolor="#DDDDCC">';
+    if ($home) {
+	return '</td><td bgcolor="#DDDDCC">'.
+	    '<input type="submit" name="dumpcourse" value="Dump Course DOCS to Construction Space" />';
+    } else {
+	return'</td><td bgcolor="#DDDDCC">'.
+      'Dump Course DOCS to Construction Space: available on other servers';
+    }
+}
+
+# -------------------------------------------------------- Actually dump course
+
+sub dumpcourse {
+    my ($home,$other,%outhash)=&authorhosts();
+    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/:/\&colon;/g;
+	    $name =~ s/:/\&colon;/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,26 +239,17 @@ 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/\:/\&colon;/g;
-                        $name=~s/\:/\&colon;/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'})) {
@@ -265,7 +337,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/'.
@@ -329,9 +401,12 @@ sub checkonthis {
                      $r->print('&nbsp;');
                  }
                  $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) {
@@ -375,8 +450,8 @@ sub handler {
 # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',
-           'Adding_Folders','Docs_Overview',
-           'Supplemental',
+           'Adding_Folders','Docs_Overview', 'Load_Map',
+           'Supplemental', 'Score_Upload_Form',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
   }
@@ -388,9 +463,9 @@ sub handler {
     $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
 		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
-		    'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
-    
-
+		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
+    $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
+ 
   if ($ENV{'form.verify'}) {
  
    my $loaderror=&Apache::lonnet::overloaderror($r);
@@ -408,6 +483,7 @@ sub handler {
        }
    }
    &untiehash();
+   $r->print('<h1>Done.</h1>');
   } elsif ($ENV{'form.versions'}) {
     $r->print('<html><head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
@@ -495,6 +571,7 @@ ENDHEADERS
           }
        }
        $r->print('</table>');
+       $r->print('<h1>Done.</h1>');
    } else {
        $r->print('<p>No content modifications yet.</p>');
    }
@@ -508,7 +585,6 @@ ENDHEADERS
     my $script='';
     my $allowed;
     my $events='';
-    my $buttons='';
     my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','foldername']);
@@ -530,7 +606,6 @@ ENDHEADERS
        $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonmenu::loadevents.
            '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
-       $buttons=&Apache::lonmenu::menubuttons(1,undef);
     }
 
 # get course data
@@ -643,12 +718,11 @@ ENDNEWSCRIPT
   }
 # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.
-            &Apache::loncommon::bodytag('Course Documents','',$events).
-            $buttons);
+            &Apache::loncommon::bodytag('Course Documents','',$events,
+					'','',$showdoc));
   unless ($showdoc) {
     if ($allowed) {
-       $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     'Editing the Table of Contents for your Course'));
+       my $dumpbut=&dumpbutton();
        $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />
@@ -660,10 +734,17 @@ ENDNEWSCRIPT
 <input type="hidden" name="folder" />
 </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">
+<table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
+<tr><td bgcolor="#DDDDCC">
 <input type="submit" name="verify" value="Verify Content" />
+</td><td bgcolor="#DDDDCC">
 <input type="submit" name="versions" value="Check Resource Versions" />
+$dumpbut
+</td></tr></table>
 </form>
 ENDCOURSEVERIFY
+       $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
+		     'Editing the Table of Contents for your Course'));
     }
 # --------------------------------------------------------- Standard documents
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
@@ -685,7 +766,8 @@ ENDCOURSEVERIFY
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'.
-$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.</font></h3></form>');
+$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'.
+$help{'Caching'}.'</font></h3></form>');
        }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
@@ -725,10 +807,11 @@ $help{'Importing_LON-CAPA_Resource'}
 </nobr>
 <p>
 <hr />
-<input type="text" size="20" name="importmap">
-<input type=button 
+<input type="text" size="20" name="importmap"><br />
+<nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="Select Map"><input type="submit" name="loadmap" value="Load Map">
+value="Select Map"> <input type="submit" name="loadmap" value="Load Map">
+$help{'Load_Map'}</nobr>
 </p>
 </form>
 </td><td bgcolor="#DDDDDD">
@@ -796,6 +879,7 @@ onClick="javascript:makesmpproblem();" /
 <nobr>
 <input name="newexamupload" type="button" value="Score Upload Form"
 onClick="javascript:makeexamupload();" />
+$help{'Score_Upload_Form'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newbul">