[metacat-cvs] metacat/src/perl register-dataset.cgi

[Saurabh Garg]

sgarg       05/11/28 16:50:38

  Modified:    src/perl register-dataset.cgi
  Log:
  Some small bug fixes...
  
  Revision  Changes    Path
  1.61      +7 -6      metacat/src/perl/register-dataset.cgi
  
  Index: register-dataset.cgi
  ===================================================================
  RCS file: /cvs/metacat/src/perl/register-dataset.cgi,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- register-dataset.cgi	28 Nov 2005 22:47:30 -0000	1.60
  +++ register-dataset.cgi	29 Nov 2005 00:50:38 -0000	1.61
  @@ -4,8 +4,8 @@
   #  Copyright: 2000 Regents of the University of California 
   #
   #   '$Author: sgarg $'
  -#     '$Date: 2005/11/28 22:47:30 $'
  -# '$Revision: 1.60 $' 
  +#     '$Date: 2005/11/29 00:50:38 $'
  +# '$Revision: 1.61 $' 
   # 
   # This program is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
  @@ -88,7 +88,6 @@
   $config->define("contactEmailAddressRequired", { DEFAULT => 'false'} );
   $config->define("publicReadable", { DEFAULT => 'true'} );
   $config->define("moderators", { DEFAULT => ''} );
  -$config->define("moderatorPermission", { DEFAULT => ''} );
   $config->define("mailhost");
   $config->define("sender");
   $config->define("recipient");
  @@ -153,7 +152,6 @@
   my $contactEmailAddressRequired = $config->contactEmailAddressRequired();
   my $publicReadable = $config->publicReadable();
   my $moderators = $config->moderators();
  -my $moderatorPermission = $config->moderatorPermission();
   my $mailhost = $config->mailhost();
   my $sender = $config->sender();
   my $recipient = $config->recipient();
  @@ -1476,7 +1474,7 @@
       	foreach(split(":",$moderators)){
       	    $doc .= "<allow>\n";
       	    $doc .= "<principal>".$_."</principal>\n";
  -    	    $doc .= "<permission>".$moderatorPermission."</permission>\n";
  +    	    $doc .= "<permission>all</permission>\n";
       	    $doc .= "</allow>\n";
           }
   	
  @@ -2573,7 +2571,7 @@
       foreach(split(":",$moderators)){
      	$accessblock .= "<allow>\n";
      	$accessblock .= "<principal>".$_."</principal>\n";
  -   	$accessblock .= "<permission>".$moderatorPermission."</permission>\n";
  +   	$accessblock .= "<permission>all</permission>\n";
      	$accessblock .= "</allow>\n";
       }
   	
  @@ -2619,8 +2617,11 @@
   	# get the contact email address from the 
       my $parser = XML::LibXML->new();
      	my $xmldoc = $parser->parse_string($emldoc);
  +	my $title = '';
  +    my $contactEmailAddress = '';
  +	my $contactName = '';
   
  -   	if ($xmldoc eq "" || $doc=~ /<error/) {
  +   	if ($xmldoc eq "" || $xmldoc=~ /<error/) {
   		# not able to parse
          	push(@errorMessages, "Error in reading the docid:".$docid."\n");
   	} else {
  @@ -2769,7 +2770,7 @@
   
   		}
   
  -	    #$response = $metacat->delete($docid);
  +	    $response = $metacat->delete($docid);
   	   	if (!$response) {
   	       	debug("Error while deleting document in handleModDecline.");
   	    	push(@errorMessages, $metacat->getMessage());