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

[banghart]

banghart		Mon Aug 15 17:16:24 2005 EDT

  Modified files:              
    /loncom/interface	lonmeta.pm 
  Log:
  	Removed duplicate routines for saving and displaying 
  	instructor metadata, and wrote inline accommodation for it.
  	Not ready yet.
  
  
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.105 loncom/interface/lonmeta.pm:1.106
--- loncom/interface/lonmeta.pm:1.105	Sat Aug 13 15:32:28 2005
+++ loncom/interface/lonmeta.pm	Mon Aug 15 17:16:22 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.105 2005/08/13 19:32:28 banghart Exp $
+# $Id: lonmeta.pm,v 1.106 2005/08/15 21:16:22 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -577,17 +577,8 @@
     } elsif ($uri=~/\/portfolio\//) {
         $r->print(&Apache::loncommon::bodytag
           ('Edit Portfolio File Information','','','',$resdomain));
-        if ($env{'form.metacourse'}) {
-            &present_instructor_metadata($r,$uri,'portfolio');  
-        } 
-        elsif ($env{'form.keywords'}) {
-            &save_instructor_metadata($r);
-            &select_course($r);
-        } else {
-            &present_editable_metadata($r,$uri,'portfolio');
-            &select_course($r);
-        }
-        
+        &present_editable_metadata($r,$uri,'portfolio');
+        &select_course($r);
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
         $r->print(&Apache::loncommon::bodytag
@@ -921,80 +912,7 @@
     $r->print("</table>");
     return;
 }
-sub save_instructor_metadata {
-    my ($r) = @_;
-    my $uri=$r->uri;
-    my $fn=&Apache::lonnet::filelocation('',$uri);
-    my @words =  &Apache::loncommon::get_env_multiple('form.keywords');
-    $r->print('This is the save instructor metadata area<br />');
-    my $mfh;
-    my $formname='store';
-    my $file_content;
-    foreach (sort keys %Apache::lonpublisher::metadatafields) {
-        next if ($_ =~ /\./);
-        my $unikey=$_;
-        $unikey=~/^([A-Za-z]+)/;
-        my $tag=$1;
-        $tag=~tr/A-Z/a-z/;
-        $file_content.= "\n\<$tag";
-        foreach (split(/\,/,
-                  $Apache::lonpublisher::metadatakeys{$unikey})
-                 ) {
-            my $value=$Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
-            $value=~s/\"/\'\'/g;
-            $file_content.=' '.$_.'="'.$value.'"' ;
-                    # print $mfh ' '.$_.'="'.$value.'"';
-        }
-        $file_content.= '>'.
-        &HTML::Entities::encode
-              ($Apache::lonpublisher::metadatafields{$unikey},
-                     '<>&"').
-                     '</'.$tag.'>';
-    }
 
-    foreach my $word (@words) {
-        $r->print('You entered:'.$word.'<br />');
-    }
-    my $tag = 'keywords';
-    $file_content.= "\n\<$tag";
-    $file_content.= '>'.
-        &HTML::Entities::encode
-              (join(', ',@words),
-                     '<>&"').
-                     '</keywords>';
-    $fn =~ /\/portfolio\/(.*)$/;
-    my $new_fn = '/'.$1;
-    $env{'form.'.$formname}=$file_content;
-    $env{'form.'.$formname.'.filename'}=$new_fn;
-    &Apache::lonnet::userfileupload('uploaddoc','',
-	        'portfolio'.$env{'form.currentpath'});
-    my $status =&Apache::lonnet::userfileupload($formname,'','portfolio');
-    if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
-        $r->print('<p><font color="red">'.
-                      &mt('Could not write metadata').', '.
-                     &mt('FAIL').'</font></p>');
-    } else {
-        $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
-	    ' '.&Apache::lonlocal::locallocaltime(time).
-	    '</font></p>');
-    }
-    return 'ok';
-}
-sub present_instructor_metadata {
-    my ($r,$uri, $file_type) = @_;
-    $r->print('This is the instructor metadata area<br />');
-    my @keywords = sort(split /, /,$env{$env{'form.metacourse'}.'.metadata.keywords'});
-    $r->print($env{'form.metacourse'}.'<br />');
-    $r->print('<form method="post" action="" size="3" >');
-    $r->print('<select name="keywords" size="3" multiple>');
-    foreach my $word (@keywords) {
-        $r->print('<option>'.$word.'</option>');
-    }
-    $r->print('</select>');
-    $r->print('<br /><input type="submit" value="Assign Meta-data" />');
-    $r->print('</form>');
-    return 'ok';
-}
 
 
 #####################################################
@@ -1102,11 +1020,30 @@
                       &prettyinput($_,
 				   $Apache::lonpublisher::metadatafields{$_},
 				   'new_'.$_,'defaultmeta').'</p>');
+            if ($env{'form.metacourse'}) {
+   
+    $r->print('This is the instructor metadata area<br />');
+    my @keywords = sort(split /, /,$env{$env{'form.metacourse'}.'.metadata.keywords'});
+    $r->print($env{'form.metacourse'}.'<br />');
+    $r->print('<form method="post" action="" size="3" >');
+    $r->print('<select name="keywords" size="3" multiple>');
+    foreach my $word (@keywords) {
+        $r->print('<option>'.$word.'</option>');
+    }
+    $r->print('</select>');
+    $r->print('<br /><input type="submit" name="store" value="Assign Meta-data" />');
+    $r->print('</form>');
+    return 'ok';
+            }
         }
         if ($env{'form.store'}) {
             my $mfh;
             my $formname='store';
             my $file_content;
+            if (&Apache::loncommon::get_env_multiple('form.keywords')) {
+            $Apache::lonpublisher::metadatafields{'coursekeyword'} = 
+                        join (', ', &Apache::loncommon::get_env_multiple('form.keywords'));
+            }
             foreach (sort keys %Apache::lonpublisher::metadatafields) {
                 next if ($_ =~ /\./);
                 my $unikey=$_;
@@ -1132,6 +1069,8 @@
             if ($fn =~ /\/portfolio\//) {
                 $fn =~ /\/portfolio\/(.*)$/;
                 my $new_fn = '/'.$1;
+                
+                $r->print('<br />Just checking<br />');
                 $env{'form.'.$formname}=$file_content;
                 $env{'form.'.$formname.'.filename'}=$new_fn;
                 &Apache::lonnet::userfileupload('uploaddoc','',