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

Timestamp:

2010-12-07T16:58:51+13:00 (13 years ago)

Author:

max

Message:

Tested using this action under windows using Sqlite as the database. Code needed a variety of updates to support this.

File:

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

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

@@ -27 +27 @@
 package baseaction;
 
-
 use strict;
+
+use inexport;
 
 our $authenication_enabled = 0;
@@ -57 +58 @@
          'iis6_mode' => $iis6_mode,
          'gsdlhome' => $ENV{'GSDLHOME'} };
-
 
     # Retrieve the (required) command CGI argument
@@ -146 +146 @@
     my $comp_args = $action_table->{$action}->{'compulsory-args'};
     foreach my $ca (@$comp_args) {
-    if (!defined $gsdl_cgi->{$ca}) {
+    if (!defined $gsdl_cgi->param($ca)) {
         $gsdl_cgi->generate_error("Compulsory argument '$ca' missing");
     }
@@ -158 +158 @@
     my $opt_args = $action_table->{$action}->{'optional-args'};
     foreach my $oa (@$opt_args) {
-    if (defined $gsdl_cgi->{$oa}) {
+    if (defined $gsdl_cgi->param($oa)) {
         
         $self->{$oa} = $gsdl_cgi->clean_param($oa);
@@ -166 +166 @@
 
 
+    # 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'};
+    }
+    
     return bless $self, $class;
 }