--- loncom/interface/lonparmset.pm	2003/09/05 03:47:47	1.124
+++ loncom/interface/lonparmset.pm	2003/10/08 23:07:01	1.129
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.124 2003/09/05 03:47:47 www Exp $
+# $Id: lonparmset.pm,v 1.129 2003/10/08 23:07:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -653,9 +653,9 @@ sub assessparms {
 
     my $r=shift;
 # -------------------------------------------------------- Variable declaration
-    my %allkeys;
-    my %allmaps;
-    my %alllevs;
+    my %allkeys=();
+    my %allmaps=();
+    my %alllevs=();
 
     $alllevs{'Resource Level'}='full';
 #    $alllevs{'Resource Level [BRIEF]'}='brief';
@@ -937,18 +937,19 @@ sub assessparms {
         $r->print("</select></td>\n");
 
         $r->print('</tr>');
-
-        $r->print('<tr><td>Select Enclosing Map or Folder</td>');
-        $r->print('<td colspan="2"><select name="pschp">');
-        $r->print('<option value="all">All Maps or Folders</option>');
-        foreach (sort {$allmaps{$a} cmp $allmaps{$b}} keys %allmaps) {
-            $r->print('<option value="'.$_.'"');
-            if (($pschp eq $_)) { $r->print(' selected'); }
-            $r->print('>'.$maptitles{$_}.($allmaps{$_}!~/^uploaded/?'  ['.$allmaps{$_}.']':'').'</option>');
-        }
-        $r->print("</select></td></tr>\n");
+	if ($parmlev ne 'general') {
+	    $r->print('<tr><td>Select Enclosing Map or Folder</td>');
+	    $r->print('<td colspan="2"><select name="pschp">');
+	    $r->print('<option value="all">All Maps or Folders</option>');
+	    foreach (sort {$allmaps{$a} cmp $allmaps{$b}} keys %allmaps) {
+		$r->print('<option value="'.$_.'"');
+		if (($pschp eq $_)) { $r->print(' selected'); }
+		$r->print('>'.$maptitles{$_}.($allmaps{$_}!~/^uploaded/?'  ['.$allmaps{$_}.']':'').'</option>');
+	    }
+	    $r->print("</select></td></tr>\n");
+	}
     } else {
-        my ($map,$id,$resource)=split(/___/,$pssymb);
+        my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
         $r->print("<tr><td>Specific Resource</td><td>$resource</td>");
         $r->print('<td><input type="submit" name="dis" value="'.$submitmessage.'"></td>');
         $r->print('</tr>');
@@ -1152,7 +1153,8 @@ ENDTABLEHEADFOUR
                     my $totalparms=scalar keys %name;
                     if ($totalparms>0) {
                         my $firstrow=1;
-
+			my $title=$bighash{'title_'.$rid};
+			$title=~s/\&colon;/:/g;
                         $r->print('<tr><td bgcolor='.$defbgone.
                              ' rowspan='.$totalparms.
                              '><tt><font size=-1>'.
@@ -1160,7 +1162,7 @@ ENDTABLEHEADFOUR
                              '</font></tt><p><b>'.
                              "<a href=\"javascript:openWindow('/res/".$uri.
                              "', 'metadatafile', '450', '500', 'no', 'yes')\";".
-                             " TARGET=_self>$bighash{'title_'.$rid}");
+                             " TARGET=_self>$title");
 
                         if ($thistitle) {
                             $r->print(' ('.$thistitle.')');
@@ -1809,7 +1811,7 @@ sub handler {
     my $r=shift;
 
     if ($r->header_only) {
-	$r->content_type('text/html');
+	&Apache::loncommon::content_type($r,'text/html');
 	$r->send_http_header;
 	return OK;
     }
@@ -1820,7 +1822,7 @@ sub handler {
     if (($ENV{'request.course.id'}) && 
 	(&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}))) {
 
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
  
         $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};