loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

-version 1.110, 2003/02/04 20:59:26
+version 1.111, 2003/02/04 22:22:07
  Line 745  sub coming_from_hash_whole {
  	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
  	}
  	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
      }
+     #needs if final resource in the map (type="finish") contains something
+ 	if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
+ 	    push @resourcelist,&coming_from_hash_whole($hash{'src_'.$current_resource});
+ 	} else {
+ 	    my $presymb;
+ 	    if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}
+               elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}
+ 	    my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
+ 	    if ($rid=~/,/) {
+ 		my @rid = split /,/, $rid;
+ 		foreach my $rid_element (@rid) {
+ 		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
+ 			$rid = $1;
+ 			last;
+ 		    }
+ 		}
+ 	    } else {
+ 	        $rid =~ m/^$mapid\.(\d*)/;
+                 $rid = $1;
+ 	    }
+ 	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
+ 	    my $symb = $presymb.'___'.$rid.'___'.$1;
+ 	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
+ 	}
+ 	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
      return @resourcelist;
  }