--- loncom/interface/londocs.pm	2003/10/28 21:50:02	1.91
+++ loncom/interface/londocs.pm	2003/11/07 23:22:21	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.91 2003/10/28 21:50:02 www Exp $
+# $Id: londocs.pm,v 1.95 2003/11/07 23:22:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -510,6 +510,7 @@ sub checkonthis {
                  &Apache::lonxml::xmlparse($r,'web',
                    &Apache::lonnet::getfile(
                     &Apache::lonnet::filelocation('',$url)));
+		 undef($Apache::lonhomework::parsing_a_problem);
 		 $ENV{'request.filename'}=$oldpath;
                  if (($Apache::lonxml::errorcount) ||
                      ($Apache::lonxml::warningcount)) {
@@ -585,20 +586,52 @@ sub checkversions {
     my %changes=();
     my $starttime=0;
     my $haschanged=0;
+    my %setversions=&Apache::lonnet::dump('resourceversions',
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+    $hashtied=0;
+    &tiehash();
+    my %newsetversions=();
     if ($ENV{'form.setmostrecent'}) {
 	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		$newsetversions{$1}='mostrecent';
+	    }
+	}
     } elsif ($ENV{'form.setcurrent'}) {
 	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		my $getvers=&Apache::lonnet::getversion($1);
+		if ($getvers>0) {
+		    $newsetversions{$1}=$getvers;
+		}
+	    }
+	}
     } elsif ($ENV{'form.setversions'}) {
 	$haschanged=1;
+	foreach (keys %ENV) {
+	    if ($_=~/^form\.set_version_(.+)$/) {
+		my $src=$1;
+		&Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});
+		if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
+		    $newsetversions{$src}=$ENV{$_};
+		}
+	    }
+	}
     }
     if ($haschanged) {
-	$r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+        if (&Apache::lonnet::put('resourceversions',\%newsetversions,
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') {		
+	    $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+	} else {
+	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
+	}
 	&changewarning($r,'');
-	return;
     }
-    $hashtied=0;
-    &tiehash();
     if ($ENV{'form.timerange'} eq 'all') {
 # show all documents
 	$header=&mt('All Documents in Course');
@@ -642,6 +675,9 @@ sub checkversions {
 	    $header=&mt('No content modifications yet.');
 	}
     }
+    %setversions=&Apache::lonnet::dump('resourceversions',
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash
 	      ('st' => 'Version changes since start of Course',
 	       'lm' => 'Version changes since last Month',
@@ -671,7 +707,6 @@ sub checkversions {
 <option value="86400" $daysel>$lt{'sy'}</option>
 </select>
 <input type="submit" name="display" value="$lt{'sd'}" />
-</form>
 <h3>$header</h3>
 <input type="submit" name="setversions" value="$lt{'sv'}" />
 <table border="2">
@@ -683,6 +718,9 @@ ENDHEADERS
 	if ($changes{$_}>$starttime) {
 	    my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
 	    my $currentversion=&Apache::lonnet::getversion($_);
+	    if ($currentversion<0) {
+		$currentversion=&mt('Could not be determined.');
+	    }
 	    my $linkurl=&Apache::lonnet::clutter($_);
 	    $r->print(
 		      '<tr><td><b>'.
@@ -694,17 +732,17 @@ ENDHEADERS
 		      $currentversion.'</font></td><td><font size="+2">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
-	    if ($usedversion) {
+	    if (($usedversion) && ($usedversion ne 'mostrecent')) {
 		$r->print($usedversion);
 	    } else {
 		$r->print($currentversion);
 	    }
 	    $r->print('</font></td><td>');
 # Set version
-	    $r->print(&Apache::loncommon::select_form($usedversion,
+	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
 						      'set_version_'.$linkurl,
 						      ('' => '',
-						       'current' => 'most recent',
+						       'mostrecent' => 'most recent',
 						       map {$_,$_} (1..$currentversion))));
 	    $r->print('</td><td><font size="1"><ul>');
 	    my $lastold=1;
@@ -732,7 +770,7 @@ ENDHEADERS
 	    $r->print('</ul></font></td></tr>');
 	}
     }
-    $r->print('</table>');
+    $r->print('</table></form>');
     $r->print('<h1>'.&mt('Done').'.</h1>');
 
     &untiehash();
@@ -758,7 +796,6 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    &Apache::lonlocal::clearreroutetrans();
 # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',
@@ -1245,7 +1282,7 @@ ENDSUPFORM
          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
   }
  }
- $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>');
+ $r->print('</body></html>');
  return OK;
 }