[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.35 and 1.36

version 1.35, 2000/10/04 15:59:07 version 1.36, 2000/10/05 19:27:23
Line 41 Line 41
 # refreshstate()     : refresh the state information string  # refreshstate()     : refresh the state information string
 # symblist(map,hash) : Updates symbolic storage links  # symblist(map,hash) : Updates symbolic storage links
 # rndseed()          : returns a random seed    # rndseed()          : returns a random seed  
   # getfile(filename)  : returns the contents of filename, or a -1 if it can't
   #                      be found, replicates and subscribes to the file
   # filelocation(dir,file) : returns a farily clean absolute reference to file 
   #                          from the directory dir
 #  #
 # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,  # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,
 # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,  # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,
Line 52 Line 56
 # 06/26 Ben Tyszka  # 06/26 Ben Tyszka
 # 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer  # 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer
 # 08/14 Ben Tyszka  # 08/14 Ben Tyszka
 # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30,  # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer
 # 10/04 Gerd Kortemeyer  # 10/04 Gerd Kortemeyer
   # 10/04 Guy Albertelli
   
   
 package Apache::lonnet;  package Apache::lonnet;
   
Line 1061  sub rndseed { Line 1067  sub rndseed {
                .$symbchck);                 .$symbchck);
 }  }
   
   # ------------------------------------------------------------ Serves up a file
   # returns either the contents of the file or a -1
   sub getfile {
     my $file=shift;
     if (! -e $file ) {
       &subscribe($file);
       &repcopy($file);
     }
     if (! -e $file ) { return -1; };
     my $fh=Apache::File->new($file);
     my $a='';
     while (<$fh>) { $a .=$_; }
     return $a
   }
   
   sub filelocation {
     my ($dir,$file) = @_;
     my $location;
     $file=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
     $file=~s/^$perlvar{'lonDocRoot'}//;
     $file=~s:^/*res::;
     if ( !( $file =~ m:^/:) ) {
       $location = $dir. '/'.$file;
     } else {
       $location = '/home/httpd/html/res'.$file;
     }
     $location=~s://+:/:g; # remove duplicate /
     while ($location=~m:/../:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
   
     return $location;
   }
   
 # ------------------------------------------------------------- Declutters URLs  # ------------------------------------------------------------- Declutters URLs
   
 sub declutter {  sub declutter {
Removed from v.1.35  
changed lines
  Added in v.1.36

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>