Changeset 23767 for main/trunk/greenstone2/perllib

Timestamp:

2011-03-09T15:04:33+13:00 (13 years ago)

Author:

davidb

Message:

CGI Perl scripts updated to work with Greenstone 3. This in turn required these supporting routines to optionally handle the 'site' variable

Location:

main/trunk/greenstone2/perllib

Files:

• cgiactions/baseaction.pm (modified) (4 diffs)
• inexport.pm (modified) (2 diffs)

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

@@ -104 +104 @@
     }
 
-
+    
     if (!defined $action_table->{$action}) {
     my $valid_actions = join(", ", keys %$action_table);
@@ -144 +144 @@
     }
     
+
     $self->{'action'} = $action;
     $self->{'collect'} = $collect;
@@ -149 +150 @@
     $self->{'timestamp'} = $timestamp;
     $self->{'site'} = $site;
-
+      
     # Locate and store compulsory arguments
     my $comp_args = $action_table->{$action}->{'compulsory-args'};
@@ -171 +172 @@
     }
 
+    
+    
     # Retrieve infodb-type
     if (defined $collect) {
-    my $inexport = newCGI inexport(ref $self,$collect);
+    
+    my $opt_site = $self->{'site'} || "";
+    
+    my $inexport = newCGI inexport(ref $self,$collect,$gsdl_cgi,$opt_site);
     my ($config_filename,$collect_cfg) = $inexport->read_collection_cfg($collect);   
     $self->{'infodbtype'} = $collect_cfg->{'infodbtype'};
+
     }
     
+    
     return $self;
 }

main/trunk/greenstone2/perllib/inexport.pm

@@ -130 +130 @@
 {
     my $class = shift (@_);
-    my ($mode,$collect) = @_;
+    my ($mode,$collect,$gsdl_cgi,$opt_site) = @_;
 
     my $self = { 'xml' => 0, 'mode' => $mode };
 
     $self->{'out'} = STDERR;
-    $self->{'site'} = "";
-    $self->{'collectdir'} = &util::filename_cat($ENV{'GSDLHOME'},"collect");
+    
+    if (defined $gsdl_cgi) {
+        $self->{'site'} = $opt_site;
+        my $collect_dir = $gsdl_cgi->get_collection_dir($opt_site);
+        $self->{'collectdir'} = $collect_dir;
+    }
+    else {  
+        $self->{'site'} = "";
+        $self->{'collectdir'} = &util::filename_cat($ENV{'GSDLHOME'},"collect");
+    }
     $self->{'faillog'} = "";
    
@@ -159 +167 @@
     my $site       = $self->{'site'};
     my $out        = $self->{'out'};
- 
+     
     if (($collection = &colcfg::use_collection($site, $collection, $collectdir)) eq "") {
     &PrintUsage::print_txt_usage($options, "{import.params}");