[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[albertel]

albertel		Fri Feb 28 12:38:40 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - coverting to use clutter/declutter
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.122 loncom/interface/lonprintout.pm:1.123
--- loncom/interface/lonprintout.pm:1.122	Thu Feb 27 16:01:09 2003
+++ loncom/interface/lonprintout.pm	Fri Feb 28 12:38:40 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.122 2003/02/27 21:01:09 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.123 2003/02/28 17:38:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -157,8 +157,7 @@
     my $primary_sequence;
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
     my @sequence = split('___',$symbolic);
-    if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];} 
-      else {$primary_sequence = '/res/'.$sequence[0];} 
+    $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
     my @master_seq = &coming_from_hash($primary_sequence);
     my @titles_master_seq = (); 
     for (my $i=0;$i<=$#master_seq;$i++) {
@@ -550,12 +549,7 @@
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
         # where is the main sequence of the course?
 	$selectionmade = 4;
-	my $main_seq;
-	if ($ENV{'request.course.uri'}=~/\/?uploaded\//) {
-	    $main_seq = $ENV{'request.course.uri'};
-	} else {
-	    $main_seq = '/res/'.$ENV{'request.course.uri'};
-	}
+	my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
 	my @file_seq = &coming_from_hash($main_seq);
 	for (my $i=0;$i<=$#file_seq;$i++) {
 	    my ($path,$title,$symb) = split /&&/,$file_seq[$i];
@@ -598,8 +592,8 @@
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
 	my @sequence = split('___',$symbolic);
 	my $primary_sequence;
-	if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];} 
-          else {$primary_sequence = '/res/'.$sequence[0];}  	
+
+	$primary_sequence=&Apache::lonnet::clutter($sequence[0]);
 	my @master_seq = &coming_from_hash($primary_sequence); 
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    my ($path,$title,$symb) = split /&&/,$master_seq[$i];
@@ -742,9 +736,7 @@
 	if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
 	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
 	} else {
-	    my $presymb; 
-	    if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;} 
-              elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;} 
+	    my $presymb=&Apache::lonnet::declutter($mainsequence);
 	    my $rid = $current_resource;
 	    if ($rid=~/,/) {
 		my @rid = split /,/, $rid;
@@ -758,8 +750,8 @@
 	        $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;  
 	    }
-	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
-	    my $symb = $presymb.'___'.$rid.'___'.$1;	    
+	    my $symb = $presymb.'___'.$rid.'___'.
+		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
 	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
 	}
 	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
@@ -768,9 +760,7 @@
 	if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
 	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
 	} else {
-	    my $presymb; 
-	    if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;} 
-              elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;} 
+	    my $presymb=&Apache::lonnet::declutter($mainsequence);
 	    my $rid = $current_resource;
 	    if ($rid=~/,/) {
 		my @rid = split /,/, $rid;
@@ -784,8 +774,8 @@
 	        $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;  
 	    }
-	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
-	    my $symb = $presymb.'___'.$rid.'___'.$1;	    
+	    my $symb = $presymb.'___'.$rid.'___'.
+		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
 	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
 	}
 	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
@@ -1159,21 +1149,18 @@
     my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
     my ($map,$id,$resource)=split(/___/,$symbolic);
+    $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence;
-    if ($map=~/^uploaded/) {
-	$name_of_sequence = $hash{'title_'.$hash{'ids_/'.$map}};
-    } else {
-	$name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};
-    }
+    $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
     if ($name_of_sequence =~ /^\s*$/) {
-     $map =~ m|([^/]+)$|;
-      $name_of_sequence = $1;
+	$map =~ m|([^/]+)$|;
+	$name_of_sequence = $1;
     }
-    my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};
+    my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};
     if ($name_of_map =~ /^\s*$/) {
-      $ENV{'request.course.uri'} =~ m|([^/]+)$|;
-      $name_of_map = $1;
-    }  
+	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
+	$name_of_map = $1;
+    }
     return ($name_of_resourse,$name_of_sequence,$name_of_map);
 
 }