--- loncom/interface/lonparmset.pm	2006/12/05 02:55:53	1.350
+++ loncom/interface/lonparmset.pm	2006/12/14 20:34:33	1.354
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.350 2006/12/05 02:55:53 albertel Exp $
+# $Id: lonparmset.pm,v 1.354 2006/12/14 20:34:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,7 +122,10 @@ sub parmval_by_symb {
 # load caches
     &cacheparmhash();
 
-    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    my $useropt;
+    if ($uname ne '' && $udom ne '') {
+	$useropt = &Apache::lonnet::get_userresdata($uname,$udom);
+    }
 
     my $result='';
     my @outpar=();
@@ -173,7 +176,7 @@ sub parmval_by_symb {
     }
 
 # ------------------------------------------------------ fourth, back to course
-    if (defined($csec)) {
+    if ($csec ne '') {
         if (defined($$courseopt{$seclevel})) {
 	    $outpar[9]=$$courseopt{$seclevel};
 	    $result=9;
@@ -189,7 +192,7 @@ sub parmval_by_symb {
 	}
     }
 # ------------------------------------------------------ fifth, check course group
-    if (defined($cgroup)) {
+    if ($cgroup ne '') {
         if (defined($$courseopt{$grplevel})) {
             $outpar[6]=$$courseopt{$grplevel};
             $result=6;
@@ -206,7 +209,7 @@ sub parmval_by_symb {
 
 # ---------------------------------------------------------- fifth, check user
 
-    if (defined($uname)) {
+    if ($uname ne '') {
 	if (defined($$useropt{$courselevel})) {
 	    $outpar[3]=$$useropt{$courselevel};
 	    $result=3;
@@ -269,10 +272,8 @@ sub resetrulescache {
 
 sub rulescache {
     my $id=shift;
-    if ($rulesid ne $env{'request.course.id'}) {
-	%rules=();
-    }
-    unless (defined($rules{$id})) {
+    if ($rulesid ne $env{'request.course.id'}
+	&& !defined($rules{$id})) {
 	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
 	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 	%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
@@ -3188,7 +3189,6 @@ ENDMAINFORMHEAD
 ### Set portfolio metadata
 sub output_row {
     my ($r, $field_name, $field_text, $added_flag) = @_;
-    my $row_class;
     my $output;
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
@@ -3197,26 +3197,47 @@ sub output_row {
         $values = '';
     }
     if (!($options =~ /deleted/)) {
-        $output = &Apache::loncommon::start_data_table_row();
-        $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
-        # $output .= '<td><strong>'.$field_text.':</strong></td>';
-        $output .= '<td><span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
-        $output .= &Apache::loncommon::end_data_table_row();
         my @options= ( ['active', 'Show to student'],
-		   ['onlyone','Student may select only one choice'],
-		   ['stuadd', 'Student may type choices']);
+                    ['stuadd', 'Provide text area for students to type catalog information'],
+                    ['choices','Provide choices for students to select from']);
+#		   ['onlyone','Student may select only one choice']);
         if ($added_flag) {
             push @options,['deleted', 'Delete Metadata Field'];
         }
+       $output = &Apache::loncommon::start_data_table_row();
+        $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
         foreach my $opt (@options) {
 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
 	    $output .= &Apache::loncommon::continue_data_table_row();
-	    $output .= '<td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.
-	        $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
-	        &mt($opt->[1]).'</label></span> </td>';
+	    $output .= '<td>'.('&nbsp;' x 5).'<span class="LC_metadata"><label>
+	               <input type="checkbox" name="'.
+	               $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+	               &mt($opt->[1]).'</label></span> </td>';
 	    $output .= &Apache::loncommon::end_data_table_row();
 	}
-	
+        $output .= &Apache::loncommon::continue_data_table_row();
+        $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
+        my $multiple_checked;
+        my $single_checked;
+        if ($options =~ m/onlyone/) {
+            $multiple_checked = "";
+            $single_checked = " CHECKED ";
+        } else {
+            $multiple_checked = " CHECKED ";
+            $single_checked = "";
+        }
+	$output .= &Apache::loncommon::continue_data_table_row();
+	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
+	            Student may select multiple choices from list</span></td>';
+	$output .= &Apache::loncommon::end_data_table_row();
+	$output .= &Apache::loncommon::continue_data_table_row();
+	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+	            <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
+	            Student may select only one choice from list</span></td>';
+	$output .= &Apache::loncommon::end_data_table_row();
     }
     return ($output);
 }
@@ -3372,7 +3393,10 @@ sub setrestrictmeta {
             	    if ($env{'form.'.$meta_field.'_stuadd'}) {
             	        $options.='stuadd,';
             	    } 
-            	    if ($env{'form.'.$meta_field.'_onlyone'}) {
+            	    if ($env{'form.'.$meta_field.'_choices'}) {
+            	        $options.='choices,';
+            	    } 
+            	    if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
             	        $options.='onlyone,';
             	    } 
             	    if ($env{'form.'.$meta_field.'_active'}) {
@@ -3381,7 +3405,6 @@ sub setrestrictmeta {
             	    if ($env{'form.'.$meta_field.'_deleted'}) {
             	        $options.='deleted,';
             	    }
-            	    
                     my $name = $save_field;
                      $put_result = &Apache::lonnet::put('environment',
                                                   {'metadata.'.$meta_field.'.options'=>$options,
@@ -3405,6 +3428,16 @@ sub setrestrictmeta {
 	    $output.= &output_row($r, $field, $metadata_fields{$field});
 	}
     }
+    my $buttons = (<<ENDButtons);
+        <input type="submit" name="restrictmeta" value="Save" />
+        </form><br />
+        <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
+        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
+        </form>
+        <br />
+        <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
+        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+ENDButtons
     my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
         $row_alt = $row_alt ? 0 : 1;
@@ -3414,14 +3447,7 @@ sub setrestrictmeta {
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
         $output
-        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions" />
-        </form><br />
-        <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
-        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
-        </form>
-        <br />
-        <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
-        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+        $buttons
         </form>
 ENDenv
     $r->print(&Apache::loncommon::end_page());