Changeset 27314 for main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

Timestamp:

2013-05-07T21:08:06+12:00 (11 years ago)

Author:

ak19

Message:

No authentication and collection-locking when getting metadata. (Only for setting metadata.)

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (9 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -193 +193 @@
     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
 
-    # Make sure the collection isn't locked by someone else
-    $self->lock_collection($username, $collect);
+    # No locking collection when getting metadata, only when setting it
+#    $self->lock_collection($username, $collect); # Make sure the collection isn't locked by someone else
 
     # look up additional args
@@ -236 +236 @@
 
     # Release the lock once it is done
-    $self->unlock_collection($username, $collect);
+#    $self->unlock_collection($username, $collect);
 }
 
@@ -388 +388 @@
     my $gsdlhome  = $self->{'gsdlhome'};
 
-    # Authenticate user if it is enabled
-    if ($baseaction::authentication_enabled) {
-    # Ensure the user is allowed to edit this collection    
-    $self->authenticate_user($username, $collect); #&authenticate_user($gsdl_cgi, $username, $collect);
-    }
-
     # Obtain the collect dir
     my $site = $self->{'site'};
     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     ##my $collect_dir = &util::filename_cat($gsdlhome, "collect");
-
-    # Make sure the collection isn't locked by someone else
-    $self->lock_collection($username, $collect);
 
     # look up additional args
@@ -433 +424 @@
     $gsdl_cgi->generate_ok_message("$metavalue");
     
-    # Release the lock once it is done
-    $self->unlock_collection($username, $collect);
 }
 
@@ -447 +436 @@
     my $gsdlhome  = $self->{'gsdlhome'};
 
-    # Authenticate user if it is enabled
-    if ($baseaction::authentication_enabled) {
-        # Ensure the user is allowed to edit this collection
-        $self->authenticate_user($username, $collect); #&authenticate_user($gsdl_cgi, $username, $collect);
-    }
-
     # Obtain the collect dir
     my $site = $self->{'site'};
     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     ##my $collect_dir = &util::filename_cat($gsdlhome, "collect");
-
-    # Make sure the collection isn't locked by someone else
-    $self->lock_collection($username, $collect);
 
     # look up additional args
@@ -494 +474 @@
     $gsdl_cgi->generate_ok_message($self->get_metadata_from_metadata_xml($gsdl_cgi, $metadata_xml_filename, $metaname, $metapos, $import_tailname));
 
-    # Release the lock once it is done
-    $self->unlock_collection($username, $collect);
 }
 
@@ -582 +560 @@
     my $infodbtype = $self->{'infodbtype'};
 
-    # Authenticate user if it is enabled
-    if ($baseaction::authentication_enabled) {
-        # Ensure the user is allowed to edit this collection        
-        $self->authenticate_user($username, $collect); #&authenticate_user($gsdl_cgi, $username, $collect);
-    }
-
     # Obtain the collect dir
     my $site = $self->{'site'};
@@ -594 +566 @@
     my $archive_dir = &util::filename_cat($collect_dir, $collect, "archives");
 
-    # Make sure the collection isn't locked by someone else
-    $self->lock_collection($username, $collect);
-    
     # look up additional args
     my ($docid, $docid_secnum) = ($self->{'d'} =~ m/^(.*?)(\..*)?$/);
@@ -613 +582 @@
     $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $docid_secnum));
 
-    # Release the lock once it is done
-    $self->unlock_collection($username, $collect);
 }