--- loncom/interface/lonmeta.pm	2002/08/26 17:02:47	1.18
+++ loncom/interface/lonmeta.pm	2002/10/25 13:50:48	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.18 2002/08/26 17:02:47 www Exp $
+# $Id: lonmeta.pm,v 1.24 2002/10/25 13:50:48 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,8 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::lonnet();
 use Apache::loncommon();
+use Apache::lonmsg;
+use Apache::lonpublisher;
 
 # ----------------------------------------- Fetch and evaluate dynamic metadata
 
@@ -44,7 +46,7 @@ sub dynamicmeta {
     my $url=&Apache::lonnet::declutter(shift);
     $url=~s/\.meta$//;
     my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
-    my $regexp=&Apache::lonnet::escape($url);
+    my $regexp=$url;
     $regexp=~s/(\W)/\\$1/g;
     $regexp='___'.$regexp.'___';
     my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
@@ -142,6 +144,23 @@ sub diffgraph {
 
 sub handler {
   my $r=shift;
+
+    my $loaderror=&Apache::lonnet::overloaderror($r);
+    if ($loaderror) { return $loaderror; }
+
+
+    my $uri=$r->uri;
+
+  unless ($uri=~/^\/\~/) { 
+# =========================================== This is not in construction space
+    my ($resdomain,$resuser)=
+           (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
+
+    $loaderror=
+       &Apache::lonnet::overloaderror($r,
+         &Apache::lonnet::homeserver($resuser,$resdomain));
+    if ($loaderror) { return $loaderror; }
+
   my %content=();
 
 # ----------------------------------------------------------- Set document type
@@ -152,12 +171,9 @@ sub handler {
   return OK if $r->header_only;
 
 # ------------------------------------------------------------------- Read file
-
-  my $uri=$r->uri;
   foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
       $content{$_}=&Apache::lonnet::metadata($uri,$_);
   }
-  my ($resdomain)=(&Apache::lonnet::declutter($uri)=~/^(\w+)\//);
 # ------------------------------------------------------------------ Hide stuff
 
   unless ($ENV{'user.adv'}) {
@@ -167,13 +183,23 @@ sub handler {
   }
 
 # --------------------------------------------------------------- Render Output
-
-my $creationdate=localtime($content{'creationdate'});
-my $lastrevisiondate=localtime($content{'lastrevisiondate'});
+  my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
+my $creationdate=localtime(
+ &Apache::loncommon::unsqltime($content{'creationdate'}));
+my $lastrevisiondate=localtime(
+ &Apache::loncommon::unsqltime($content{'lastrevisiondate'}));
 my $language=&Apache::loncommon::languagedescription($content{'language'});
 my $mime=&Apache::loncommon::filedescription($content{'mime'}); 
 my $disuri=&Apache::lonnet::declutter($uri);
   $disuri=~s/\.meta$//;
+my $currentversion=&Apache::lonnet::getversion($disuri);
+my $versiondisplay='';
+if ($thisversion) {
+    $versiondisplay='Version: '.$thisversion.
+    ' (most recent version: '.$currentversion.')';
+} else {
+    $versiondisplay='Version: '.$currentversion;
+}
 my $bodytag=&Apache::loncommon::bodytag
             ('Catalog Information','','','',$resdomain);
   $r->print(<<ENDHEAD);
@@ -181,6 +207,7 @@ my $bodytag=&Apache::loncommon::bodytag
 $bodytag
 <h2>$content{'title'}</h2>
 <h3><tt>$disuri</tt></h3>
+$versiondisplay<br />
 <table cellspacing=2 border=0>
 <tr><td bgcolor='#AAAAAA'>Author(s)</td>
 <td bgcolor="#CCCCCC">$content{'author'}&nbsp;</td></tr>
@@ -271,7 +298,17 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
        || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
       $r->print(
   '<h4>Evaluation Comments (visible to author and co-authors only)</h4>'.
-      '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');      
+      '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
+      $r->print(
+   '<h4>Error Messages (visible to author and co-authors only)</h4>');
+      my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
+      foreach (keys %errormsgs) {
+	if ($_=~/^$disuri\_\d+$/) {
+          my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});
+	  $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.
+                    '<br />');
+        }
+      }      
    }
 # ------------------------------------------------------------- All other stuff
    $r->print(
@@ -294,8 +331,78 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
       $r->print("<br>\n");
    }
   }
-  $r->print('</body></html>');
-  return OK;
+# ===================================================== End Resource Space Call
+ } else {
+# ===================================================== Construction Space Call
+
+# ----------------------------------------------------------- Set document type
+
+  $r->content_type('text/html');
+  $r->send_http_header;
+
+  return OK if $r->header_only;
+# ---------------------------------------------------------------------- Header
+  my $bodytag=&Apache::loncommon::bodytag('Edit Catalog Information');
+  my $disuri=$uri;
+  my $fn=&Apache::lonnet::filelocation('',$uri);
+  $disuri=~s/^\/\~\w+//;
+  $disuri=~s/\.meta$//;
+  my $displayfile='Catalog Information for '.$disuri;
+  if ($disuri=~/\/default$/) {
+      my $dir=$disuri;
+      $dir=~s/default$//;
+      $displayfile='Default Cataloging Information for Directory '.$dir;
+  }
+  %Apache::lonpublisher::metadatafields=();
+  %Apache::lonpublisher::metadatakeys=();
+  &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn));
+  $r->print(<<ENDEDIT);
+<html><head><title>Edit Catalog Information</title></head>
+$bodytag
+<h1>$displayfile</h1>
+<form method="post">
+ENDEDIT
+   foreach ('author','title','subject','keywords','abstract','notes',
+            'copyright','language') {
+       if ($ENV{'form.new_'.$_}) {
+	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
+       }
+       $r->print(
+         &Apache::lonpublisher::textfield($_,'new_'.$_,
+                                 $Apache::lonpublisher::metadatafields{$_}));
+   }
+   if ($ENV{'form.store'}) {
+      my $mfh;
+      unless ($mfh=Apache::File->new('>'.$fn)) {
+            $r->print(
+            '<p><font color=red>Could not write metadata, FAIL</font>');
+      } else {
+          foreach (sort keys %Apache::lonpublisher::metadatafields) {
+            unless ($_=~/\./) {
+                my $unikey=$_;
+                $unikey=~/^([A-Za-z]+)/;
+                my $tag=$1;
+                $tag=~tr/A-Z/a-z/;
+                print $mfh "\n\<$tag";
+                foreach 
+                  (split(/\,/,$Apache::lonpublisher::metadatakeys{$unikey})) {
+                    my $value=
+                       $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+                    $value=~s/\"/\'\'/g;
+                    print $mfh ' '.$_.'="'.$value.'"';
+                }
+                print $mfh '>'.
+        &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey})
+                        .'</'.$tag.'>';
+            }
+	  }
+          $r->print('<p>Wrote Metadata');
+      }
+    }
+    $r->print(
+ '<br /><input type="submit" name="store" value="Store Catalog Information"></form></body></html>');
+    return OK;
+  }
 }
 
 1;