Changeset 23477 for main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

Timestamp:

2010-12-14T14:35:39+13:00 (13 years ago)

Author:

davidb

Message:

"un" cgi argument is now compulsory if authentication is on, and made options when not.

File:

• main/trunk/greenstone2/perllib/cgiactions/baseaction.pm (modified) (2 diffs)

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

@@ -70 +70 @@
         $err_mess .= "  $a:\n";
         $err_mess .= "    Compulsory args: ";
-        $err_mess .= join(", ", ("c", "un"), 
-                  @{$action_table->{$a}->{'compulsory-args'}});
+        my @comp_args = ("c");
+        push(@comp_args,"un") if ($authenication_enabled);
+        push(@comp_args,@{$action_table->{$a}->{'compulsory-args'}});
+        $err_mess .= join(", ", @comp_args);
+
         $err_mess .= "\n";
 
-        if (scalar(@{$action_table->{$a}->{'optional-args'}})>0) {
+        my @opt_args = ();
+        push(@opt_args,"un") if (!$authenication_enabled);
+        push(@opt_args,@{$action_table->{$a}->{'optional-args'}});
+
+        if (scalar(@opt_args)>0) {
 
         $err_mess .= "    Optional args  : ";
-        $err_mess .= join(", ", @{$action_table->{$a}->{'optional-args'}});
+        $err_mess .= join(", ", @opt_args);
         $err_mess .= "\n";
         }
@@ -165 +172 @@
     }
 
-
-    # Retrieve infodb-type
-    if (defined $collect) {
-        my $inexport = newCGI inexport("metadata-server",$collect);
-        my ($config_filename,$collect_cfg) = $inexport->read_collection_cfg($collect);   
-        $self->{'infodbtype'} = $collect_cfg->{'infodbtype'};
-    }
-    
+    # Retrieve infodb-type
+    if (defined $collect) {
+    my $inexport = newCGI inexport(ref $self,$collect);
+    my ($config_filename,$collect_cfg) = $inexport->read_collection_cfg($collect);   
+    $self->{'infodbtype'} = $collect_cfg->{'infodbtype'};
+    }
+    
     return $self;
 }