--- loncom/lonnet/perl/lonnet.pm	2004/04/01 14:55:18	1.482
+++ loncom/lonnet/perl/lonnet.pm	2004/04/01 15:24:44	1.484
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.482 2004/04/01 14:55:18 albertel Exp $
+# $Id: lonnet.pm,v 1.484 2004/04/01 15:24:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4076,6 +4076,22 @@ sub metadata {
 # the next is the end of "start tag"
 	    }
 	}
+	my ($extension) = ($uri =~ /\.(\w+)$/);
+	foreach my $key (sort(keys(%packagetab))) {
+	    #&logthis("extsion1 $extension $key !!");
+	    #no specific packages #how's our extension
+	    if ($key!~/^extension_\Q$extension\E&/) { next; }
+	    &metadata_create_pacakge_def($uri,$key,'extension_'.$extension,
+					 \%metathesekeys);
+	}
+	if (!exists($metacache{$uri}->{':packages'})) {
+	    foreach my $key (sort(keys(%packagetab))) {
+		#no specific packages well let's get default then
+		if ($key!~/^default&/) { next; }
+		&metadata_create_pacakge_def($uri,$key,'default',
+					     \%metathesekeys);
+	    }
+	}
 # are there custom rights to evaluate
 	if ($metacache{$uri}->{':copyright'} eq 'custom') {
 
@@ -4104,6 +4120,30 @@ sub metadata {
     return $metacache{$uri}->{':'.$what};
 }
 
+sub metadata_create_pacakge_def {
+    my ($uri,$key,$package,$metathesekeys)=@_;
+    my ($pack,$name,$subp)=split(/\&/,$key);
+    if ($subp eq 'default') { next; }
+    
+    if (defined($metacache{$uri}->{':packages'})) {
+	$metacache{$uri}->{':packages'}.=','.$package;
+    } else {
+	$metacache{$uri}->{':packages'}=$package;
+    }
+    my $value=$packagetab{$key};
+    my $unikey;
+    $unikey='parameter_0_'.$name;
+    $metacache{$uri}->{':'.$unikey.'.part'}=0;
+    $$metathesekeys{$unikey}=1;
+    unless (defined($metacache{$uri}->{':'.$unikey.'.'.$subp})) {
+	$metacache{$uri}->{':'.$unikey.'.'.$subp}=$value;
+    }
+    if (defined($metacache{$uri}->{':'.$unikey.'.default'})) {
+	$metacache{$uri}->{':'.$unikey}=
+	    $metacache{$uri}->{':'.$unikey.'.default'};
+    }
+}
+
 sub metadata_generate_part0 {
     my ($metadata,$metacache,$uri) = @_;
     my %allnames;
@@ -4378,6 +4418,21 @@ sub numval {
     return int($txt);
 }
 
+sub numval2 {
+    my $txt=shift;
+    $txt=~tr/A-J/0-9/;
+    $txt=~tr/a-j/0-9/;
+    $txt=~tr/K-T/0-9/;
+    $txt=~tr/k-t/0-9/;
+    $txt=~tr/U-Z/0-5/;
+    $txt=~tr/u-z/0-5/;
+    $txt=~s/\D//g;
+    my @txts=split(/(\d\d\d\d\d\d\d\d\d)/,$txt);
+    my $total;
+    foreach my $val (@txts) { $total+=$val; }
+    return int($total);
+}
+
 sub latest_rnd_algorithm_id {
     return '64bit2';
 }
@@ -4393,9 +4448,9 @@ sub rndseed {
     if (!$domain) { $domain=$wdomain; }
     if (!$username) { $username=$wusername }
     my $which=$ENV{"course.$courseid.rndseed"};
-    my $CODE=$ENV{'scantron.CODE'};
+    my $CODE=$ENV{'form.CODE'};
     if (defined($CODE)) {
-	&rndseed_CODE_64bit($symb,$courseid,$domain,$username);
+	return &rndseed_CODE_64bit($symb,$courseid,$domain,$username);
     } elsif ($which eq '64bit2') {
 	return &rndseed_64bit2($symb,$courseid,$domain,$username);
     } elsif ($which eq '64bit') {
@@ -4468,12 +4523,13 @@ sub rndseed_CODE_64bit {
     {
 	use integer;
 	my $symbchck=unpack("%32S*",$symb.' ') << 16;
-	my $symbseed=numval($symb);
-	my $CODEseed=numval($ENV{'scantron.CODE'}) << 16;
+	my $symbseed=numval2($symb);
+	my $CODEchck=unpack("%32S*",$ENV{'form.CODE'}.' ') << 16;
+	my $CODEseed=numval($ENV{'form.CODE'});
 	my $courseseed=unpack("%32S*",$courseid.' ');
-	my $num1=$symbseed+$CODEseed;
-	my $num2=$courseseed+$symbchck;
-	#&Apache::lonxml::debug("$symbseed:$CODEseed|$courseseed:$symbchck");
+	my $num1=$symbseed+$CODEchck;
+	my $num2=$CODEseed+$courseseed+$symbchck;
+	#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
 	return "$num1,$num2";
     }
@@ -4791,7 +4847,7 @@ BEGIN {
     open(my $config,"</etc/httpd/conf/loncapa.conf");
 
     while (my $configline=<$config>) {
-        if ($configline =~ /^[^\#]*PerlSetVar/) {
+        if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) {
 	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
            chomp($varvalue);
            $perlvar{$varname}=$varvalue;
@@ -4909,6 +4965,7 @@ BEGIN {
     open(my $config,"<$perlvar{'lonTabDir'}/packages.tab");
 
     while (my $configline=<$config>) {
+	if ($configline !~ /\S/ || $configline=~/^#/) { next; }
 	chomp($configline);
 	my ($short,$plain)=split(/:/,$configline);
 	my ($pack,$name)=split(/\&/,$short);