Changeset 11936


Ignore:
Timestamp:
2006-06-19T16:59:23+12:00 (18 years ago)
Author:
mdewsnip
Message:

Changed order of arguments to lock_collection, to be consistent.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/cgi-bin/gliserver.pl

    r11832 r11936  
    159159{
    160160    my $gsdl_cgi = shift(@_);
     161    my $username = shift(@_);
    161162    my $collection = shift(@_);
    162     my $username = shift(@_);
    163163
    164164    my $steal_lock = $gsdl_cgi->clean_param("steal_lock");
    … …  
    239239
    240240    # Make sure the collection isn't locked by someone else
    241     &lock_collection($gsdl_cgi, $collection, $username);
     241    &lock_collection($gsdl_cgi, $username, $collection);
    242242
    243243    $gsdl_cgi->checked_chdir($collect_directory);
    … …  
    280280
    281281    # Make sure the collection isn't locked by someone else
    282     &lock_collection($gsdl_cgi, $collection, $username);
     282    &lock_collection($gsdl_cgi, $username, $collection);
    283283
    284284    # Check that the collection file exists
    … …  
    319319
    320320    # Make sure the collection isn't locked by someone else
    321     &lock_collection($gsdl_cgi, $collection, $username);
     321    &lock_collection($gsdl_cgi, $username, $collection);
    322322
    323323    # Zip up the collection
    … …  
    366366
    367367    # Make sure the collection isn't locked by someone else
    368     &lock_collection($gsdl_cgi, $collection, $username);
     368    &lock_collection($gsdl_cgi, $username, $collection);
    369369
    370370    # Zip up the collection archives
    … …  
    458458
    459459    # Make sure the collection isn't locked by someone else
    460     &lock_collection($gsdl_cgi, $collection, $username);
     460    &lock_collection($gsdl_cgi, $username, $collection);
    461461
    462462    # Zip up the collection file
    … …  
    566566
    567567    # Make sure the collection isn't locked by someone else
    568     &lock_collection($gsdl_cgi, $collection, $username);
     568    &lock_collection($gsdl_cgi, $username, $collection);
    569569
    570570    &util::mv($source_file, $target_file);
    … …  
    611611
    612612    # Make sure the collection isn't locked by someone else
    613     &lock_collection($gsdl_cgi, $collection, $username);
     613    &lock_collection($gsdl_cgi, $username, $collection);
    614614
    615615    &util::mk_dir($directory);
    … …  
    643643
    644644    # Make sure the collection isn't locked by someone else (unless we're running mkcol.pl, of course)
    645     &lock_collection($gsdl_cgi, $collection, $username) unless ($script eq "mkcol.pl");
     645    &lock_collection($gsdl_cgi, $username, $collection) unless ($script eq "mkcol.pl");
    646646
    647647    my $perl_args = $collection;
    … …  
    711711
    712712    # Make sure the collection isn't locked by someone else
    713     &lock_collection($gsdl_cgi, $collection, $username);
     713    &lock_collection($gsdl_cgi, $username, $collection);
    714714
    715715    my $directory_path = &util::filename_cat($collection_directory, $directory);
Note: See TracChangeset for help on using the changeset viewer.