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

[sakharuk]

sakharuk		Thu Sep 12 14:28:45 2002 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Changes to lonnavmap navigation mechanism are implemented and all
  previous tools are removed. 
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.63 loncom/interface/lonprintout.pm:1.64
--- loncom/interface/lonprintout.pm:1.63	Thu Sep 12 11:25:49 2002
+++ loncom/interface/lonprintout.pm	Thu Sep 12 14:28:45 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.63 2002/09/12 15:25:49 albertel Exp $
+# $Id: lonprintout.pm,v 1.64 2002/09/12 18:28:45 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -371,9 +371,6 @@
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
 	$symbolic =~ m/([^_]+)_/;
 	my $primary_sequence = '/res/'.$1;
-        #-- open and analyses the primary sequence
-	my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
-	my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
 	my @master_seq = &coming_from_hash($primary_sequence); 
         #-- produce an output string
 	for (my $i=0;$i<=$#master_seq;$i++) {
@@ -403,51 +400,7 @@
         # where is the main sequence of the course?
 	$selectionmade = 4;
 	my $main_seq = '/res/'.$ENV{'request.course.uri'};
-	my $file=&Apache::lonnet::filelocation("",$main_seq);
-	my $filecontents=&Apache::lonnet::getfile($file);
-	my @file_seq = &content_map($filecontents);
-	for (my $iu=0;$iu<=$#file_seq;$iu++) {
-	    $file_seq[$iu]=~s/^"//;
-	    $file_seq[$iu]=~s/"$//;
-	    if ($file_seq[$iu]=~m/\S+/) {
-		$file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
-	    } else {
-		$file_seq[$iu]= 'REMOVE IT PLEASE';
-	    }
-	}
-	my $i=0;
-        my $limit = $#file_seq;		    
-        while ($i<=$limit) {	
-	    unless ($file_seq[$i]=~m/\.(problem|page)/) {
-		if ($file_seq[$i]=~m/\.sequence/) {
-		    my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
-		    my @newfile_seq = &content_map($filecontents);
-		    for (my $iu=0;$iu<=$#newfile_seq;$iu++) {
-			$newfile_seq[$iu]=~s/^"//;
-	                $newfile_seq[$iu]=~s/"$//;
-			if ($newfile_seq[$iu]=~m/\S+/) {
-			    $newfile_seq[$iu]=&Apache::lonnet::filelocation("",$newfile_seq[$iu]);
-			} else {
-			    $newfile_seq[$iu]= 'REMOVE IT PLEASE';
-			}
-		    }
-		    splice @file_seq,$i,1,@newfile_seq;
-		    $i=0;
-		    $limit = $#file_seq;
-		} else {
-		    splice @file_seq,$i,1,'REMOVE IT PLEASE';
-		}
-	    }
-	    $i++;
-	}
-	for (my $iu=0;$iu<=$#file_seq;$iu++) {
-	    if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
-		splice @file_seq,$iu,1;
-	    }
-	}
-	if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
-	    pop @file_seq;
-	}
+	my @file_seq = &coming_from_hash($main_seq); 
         #-- produce an output string
 	for (my $i=0;$i<=$#file_seq;$i++) {
             my $urlp = $file_seq[$i];
@@ -475,10 +428,7 @@
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
 	$symbolic =~ m/([^_]+)_/;
 	my $primary_sequence = '/res/'.$1;
-	#opens and analyses the primary sequence file, produces the array of resources
-	my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
-	my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
-	my @master_seq = &content_map($sequencefilecontents);
+	my @master_seq = &coming_from_hash($primary_sequence); 
        #loop over students
 	foreach my $person (@students) {
 	    my $current_output = ''; 
@@ -973,62 +923,6 @@
     $result =~ s/\\parbox{\\minipagewidth}{}\s*\\\\\s*(\\parbox{\\minipagewidth})/$1/g;
     $result =~ s/\\parbox{\\minipagewidth}{\s*\\\\\\\\/\\parbox{\\minipagewidth}{/g;
     return $result,$number_of_columns;
-}
-
-sub content_map {
-#-- find a list of files to print
-    my $map_string = shift;
-    my @number_seq = ();
-    my @file_seq = ();
-    my $startlink = index($map_string,'<link',0);
-    my $endlink = index($map_string,'</link>',$startlink);
-    my $chunk = substr($map_string,$startlink,$endlink-$startlink+7);
-    $_ = $chunk;
-    m/from=\"(\d+)\"/;
-    push @number_seq,$1;
-    while ($startlink != -1) {
-	$endlink = index($map_string,'</link>',$startlink);
-	$chunk = substr($map_string,$startlink,$endlink-$startlink+7);
-	substr($map_string,$startlink,$endlink-$startlink+7) = '';
-	$_ = $chunk;
-        m/to=\"(\d+)\"/;
-	push @number_seq,$1;
-	$startlink = index($map_string,'from="'.$1.'"',0);
-	$startlink = rindex($map_string,'<link ',$startlink);
-    }
-    my $stalink = index($map_string,' to="'.$number_seq[0].'"',0);
-    while ($stalink != -1) {
-	$startlink = rindex($map_string,'<link ',$stalink);
-	$endlink = index($map_string,'</link>',$startlink);
-	$chunk = substr($map_string,$startlink,$endlink-$startlink+7);
-	substr($map_string,$startlink,$endlink-$startlink+7) = '';
-	$_ = $chunk;
-        m/from=\"(\d+)\"/;
-	unshift @number_seq,$1;
-	$stalink = index($map_string,' to="'.$number_seq[0].'"',0);
-    }
-    for (my $i=0;$i<=$#number_seq;$i++) {
-	$stalink = index($map_string,' id="'.$number_seq[$i].'"',0);
-        {    
-	    my $ahed1 = index($map_string,'src="',$stalink);
-	    my $ahed2 = index($map_string,'</resource>',$stalink);
-	    if ($ahed1 != -1) {
-		if ($ahed1 < $ahed2) {
-		    $startlink = $ahed1;
-		} else {
-		    $startlink = rindex($map_string,'src="',$stalink);
-		}
-	    } else {
-		$startlink = rindex($map_string,'src="',$stalink);
-	    }
-
-	}
-	$startlink = index($map_string,'"',$startlink);
-	$endlink = index($map_string,'"',$startlink+1);
-	$chunk = substr($map_string,$startlink,$endlink-$startlink+1);
-	push @file_seq,$chunk;
-    }
-    return @file_seq;
 }