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

[albertel]

albertel		Fri Aug  4 18:16:42 2006 EDT

  Modified files:              
    /loncom/interface	lonmeta.pm 
    /loncom/publisher	lonpublisher.pm 
  Log:
  - some @ -> : conversion
  
  
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.163 loncom/interface/lonmeta.pm:1.164
--- loncom/interface/lonmeta.pm:1.163	Fri Aug  4 18:14:38 2006
+++ loncom/interface/lonmeta.pm	Fri Aug  4 18:16:38 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.163 2006/08/04 22:14:38 albertel Exp $
+# $Id: lonmeta.pm,v 1.164 2006/08/04 22:16:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -170,7 +170,7 @@
     my ($aname,$adom)=@_;
     return &Apache::loncommon::aboutmewrapper
         (&Apache::loncommon::plainname($aname,$adom),
-         $aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>';
+         $aname,$adom,'preview').' <tt>['.$aname.':'.$adom.']</tt>';
 }
 
 # Pretty display
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.210 loncom/publisher/lonpublisher.pm:1.211
--- loncom/publisher/lonpublisher.pm:1.210	Wed Jul 19 16:22:03 2006
+++ loncom/publisher/lonpublisher.pm	Fri Aug  4 18:16:42 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.210 2006/07/19 20:22:03 albertel Exp $
+# $Id: lonpublisher.pm,v 1.211 2006/08/04 22:16:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -942,7 +942,7 @@
 	return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1);
     }
     print $logfile 
-"\n\n================= Publish ".localtime()." Phase One  ================\n".$env{'user.name'}.'@'.$env{'user.domain'}."\n";
+"\n\n================= Publish ".localtime()." Phase One  ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
 
     if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
 # ------------------------------------------------------- This needs processing
@@ -1036,7 +1036,7 @@
 		                  $env{'environment.generation'};
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
-        $metadatafields{'owner'}=$cuname.'@'.$cudom;
+        $metadatafields{'owner'}=$cuname.':'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
@@ -1439,7 +1439,7 @@
         return 0;
     }
     print $logfile 
-        "\n================= Publish ".localtime()." Phase Two  ================\n".$env{'user.name'}.'@'.$env{'user.domain'}."\n";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
     
     %metadatafields=();
     %metadatakeys=();
@@ -1467,9 +1467,9 @@
     $metadatafields{'obsoletereplacement'}=
 	                        $env{'form.obsoletereplacement'};
     $metadatafields{'dependencies'}=$env{'form.dependencies'};
-    $metadatafields{'modifyinguser'}=$env{'user.name'}.'@'.
+    $metadatafields{'modifyinguser'}=$env{'user.name'}.':'.
 	                                 $env{'user.domain'};
-    $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
+    $metadatafields{'authorspace'}=$cuname.':'.$cudom;
     
     my $allkeywords=$env{'form.addkey'};
     if (exists($env{'form.keywords'})) {