--- rat/lonuserstate.pm	2002/07/25 16:55:53	1.35
+++ rat/lonuserstate.pm	2002/10/10 19:05:32	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.35 2002/07/25 16:55:53 www Exp $
+# $Id: lonuserstate.pm,v 1.46 2002/10/10 19:05:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,6 +68,11 @@ my @cond;    # Array with all of the con
 my $errtext; # variable with all errors
 my $retfurl; # variable with the very first URL in the course
 my %randompick; # randomly picked resources
+my %actualversion; # version of resource as loaded now
+my %setversion; # forced version of resource
+my %lastversion; # version when CC came in last
+my $versionmode; # how versioning is handled in this course
+
 # --------------------------------------------------------- Loads map from disk
 
 sub loadmap { 
@@ -79,7 +84,10 @@ sub loadmap {
     $hash{'map_pc_'.$uri}=$lpc;
     $hash{'map_id_'.$lpc}=$uri;
 
-    my $fn='/home/httpd/html'.$uri;
+# Determine and check filename
+    my $fn=&Apache::lonnet::filelocation('',$uri);
+
+    my $ispage=($fn=~/\.page$/);
 
     unless (($fn=~/\.sequence$/) ||
             ($fn=~/\.page$/)) { 
@@ -87,32 +95,12 @@ sub loadmap {
        return OK; 
     }
 
-    my $ispage=($fn=~/\.page$/);
+    my $instr=&Apache::lonnet::getfile($fn);
 
-    unless (-e $fn) {
-	my $returned=Apache::lonnet::repcopy($fn);
-        unless ($returned eq OK) {
-           $errtext.="Could not import: $fn - ";
-           if ($returned eq HTTP_SERVICE_UNAVAILABLE) {
-	      $errtext.="Server unavailable\n";
-           }
-           if ($returned eq HTTP_NOT_FOUND) {
-	      $errtext.="File not found\n";
-           }
-           if ($returned eq FORBIDDEN) {
-	      $errtext.="Access forbidden\n";
-           }
-           return OK;
-       }
-    }
+    unless ($instr == -1) {
+
+# Successfully got file, parse it
 
-    if (-e $fn) {
-        my @content;
-        {
-	    my $fh=Apache::File->new($fn);
-            @content=<$fh>;
-        }
-        my $instr=join('',@content);
         my $parser = HTML::TokeParser->new(\$instr);
         my $token;
 
@@ -135,11 +123,18 @@ sub loadmap {
                     unless ($ispage) {
                         $turi=~/\.(\w+)$/;
                         my $embstyle=&Apache::loncommon::fileembstyle($1);
-                        if ($token->[2]->{'external'} eq 'true') {
+                        if ($token->[2]->{'external'} eq 'true') { # external
                             $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
-                        } else {
-                           my $embstyle=&Apache::loncommon::fileembstyle($1);
-                           if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+                        } elsif ($turi=~/^\/*uploaded\//) { # uploaded
+			    if (($embstyle eq 'img') || ($embstyle eq 'emb')
+                             || ($embstyle eq 'ssi')) {
+                                $turi='/adm/wrapper'.$turi;
+                            } elsif ($turi!~/\.(sequence|page)$/) {
+				$turi='/adm/coursedocs/showdoc'.$turi;
+                            }
+                        } else { # normal internal resource
+                           if (($embstyle eq 'img') || ($embstyle eq 'emb')
+             || ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/)) {
 			       $turi='/adm/wrapper'.$turi;
                            }
                         }
@@ -473,13 +468,13 @@ sub readmap {
    unlink($fn.'parms.db');
    undef %randompick;
    $retfurl='';
-   if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) &&
-       (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT,0640))) {
+   if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) &&
+       (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640))) {
     %hash=();
     %parmhash=();
     $errtext='';
     $pc=0;
-    my $furi='/res/'.&Apache::lonnet::declutter($uri);
+    my $furi=&Apache::lonnet::clutter($uri);
     $hash{'src_0.0'}=$furi;
     $hash{'title_0.0'}=&Apache::lonnet::metadata($uri,'title');
     $hash{'ids_'.$furi}='0.0';
@@ -490,6 +485,10 @@ sub readmap {
         &accinit($uri,$short,$fn);
         &pickrandom();
     }
+# ------------------------------------------------------------ Version tracking
+    if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+	&Apache::lonnet::logthis('Will be version tracking');
+    }
     unless ((untie(%hash)) && (untie(%parmhash))) {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".
                        "Could not untie coursemap $fn for $uri.</font>"); 
@@ -508,6 +507,17 @@ sub readmap {
                        "Could not tie coursemap $fn for $uri.</font>"); 
    }
    &Apache::lonmsg::author_res_msg($ENV{'request.course.uri'},$errtext);
+# ------------------------------------------------- Check for critical messages
+
+    my @what=&Apache::lonnet::dump('critical',$ENV{'user.domain'},
+                                              $ENV{'user.name'});
+    if ($what[0]) {
+	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
+	    $retfurl='/adm/email?critical=display';
+        }
+    }
+
+
    return ($retfurl,$errtext);
 }