Changeset 25078 for main

Timestamp:

2012-02-13T20:05:33+13:00 (12 years ago)

Author:

davidb

Message:

@INC updated to include extension perllib folders

File:

• main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm (modified) (1 diff)

main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

@@ -603 +603 @@
     }
 
+
     # Process any extension setup.pl files
-    my $ext_home = &util::filename_cat($gsdlhome,"ext");
-
-    if (opendir(EXTDIR,$ext_home) ) {
-    my @pot_ext_dir = grep { $_ !~ m/^\./ } readdir(EXTDIR);
-
-    closedir(EXTDIR);
-
-    foreach my $ed (@pot_ext_dir) {
-        my $full_ext_dir = &util::filename_cat($ext_home,$ed);
-        if (-d $full_ext_dir) {
-        my $full_inc_file = &util::filename_cat($full_ext_dir,
-                            "$ed-setup.pl");
-        if (-f $full_inc_file) {
-
-            my $store_cwd = Cwd::cwd();
-
-            chdir($full_ext_dir);
-            require "./$ed-setup.pl";
-            chdir($store_cwd);
+    my @ext_homes = ();
+
+    my $gsdl_ext_home = &util::filename_cat($gsdlhome,"ext");
+    push(@ext_homes,$gsdl_ext_home);
+
+    if ($self->{'greenstone_version'} == 3) {
+    my $gsdl3srchome = $self->get_gsdl3_src_home();
+    my $gsdl3_ext_home = &util::filename_cat($gsdl3srchome,"ext");
+    push(@ext_homes,$gsdl3_ext_home);
+    }
+
+    foreach my $ext_home (@ext_homes) {
+    # Should really think about making this a subroutine
+
+    if (opendir(EXTDIR,$ext_home) ) {
+        my @pot_ext_dir = grep { $_ !~ m/^\./ } readdir(EXTDIR);
+        
+        closedir(EXTDIR);
+        
+        foreach my $ed (@pot_ext_dir) {
+        my $full_ext_dir = &util::filename_cat($ext_home,$ed);
+
+        if (-d $full_ext_dir) {
+
+            my $full_ext_perllib_dir = &util::filename_cat($full_ext_dir,"perllib");
+            if (-d $full_ext_perllib_dir) {
+            unshift (@INC, $full_ext_perllib_dir);
+            }
+
+            my $full_inc_file = &util::filename_cat($full_ext_dir,
+                                "$ed-setup.pl");
+            if (-f $full_inc_file) {
+            
+            my $store_cwd = Cwd::cwd();
+            
+            chdir($full_ext_dir);
+            require "./$ed-setup.pl";
+            chdir($store_cwd);
+            }
         }
         }