Changeset 24872 for main/trunk/greenstone2/cgi-bin

Timestamp:

2011-12-09T16:25:34+13:00 (12 years ago)

Author:

ak19

Message:

First set of changes to do with migration of cgi-bin into common-src, so that upon make install, common-src\cgi-bin will be installed in cgi-bin\GSDLOS(GSDLARCH). After this commit (to do with the contents of the files), cgi-bin itself will be moved.

Location:

main/trunk/greenstone2/cgi-bin

Files:

• build-server.pl (modified) (1 diff)
• experimental-ocr-server.pl (modified) (1 diff)
• explode-server.pl (modified) (1 diff)
• gliserver.pl (modified) (1 diff)
• gsdlCGI.pm (modified) (1 diff)
• image-server.pl (modified) (1 diff)
• index-server.pl (modified) (1 diff)
• metadata-server.pl (modified) (1 diff)

main/trunk/greenstone2/cgi-bin/build-server.pl

@@ -23 +23 @@
 if ($iis6_mode)
 {
-    # Change into cgi-bin directory
+    # Change into cgi-bin\<OS> directory
     chdir("cgi-bin");
+    if(defined $ENV{'GSDLARCH'}) {
+    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
+    } else {
+    chdir($ENV{'GSDLOS'});
+    }
 }
 

main/trunk/greenstone2/cgi-bin/experimental-ocr-server.pl

@@ -26 +26 @@
 if ($iis6_mode)
 {
-    # Change into cgi-bin directory
+    # Change into cgi-bin\<OS> directory
     chdir("cgi-bin");
+    if(defined $ENV{'GSDLARCH'}) {
+    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
+    } else {
+    chdir($ENV{'GSDLOS'});
+    }
 }
 

main/trunk/greenstone2/cgi-bin/explode-server.pl

@@ -22 +22 @@
 if ($iis6_mode)
 {
-    # Change into cgi-bin directory
+    # Change into cgi-bin\<OS> directory
     chdir("cgi-bin");
+    if(defined $ENV{'GSDLARCH'}) {
+    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
+    } else {
+    chdir($ENV{'GSDLOS'});
+    }
 }
 

main/trunk/greenstone2/cgi-bin/gliserver.pl

@@ -25 +25 @@
 if ($iis6_mode)
 {
-    # Change into cgi-bin directory - need to ensure it exists, since gliserver deals with both GS2 and GS3
+    # Change into cgi-bin\<OS> directory - need to ensure it exists, since gliserver deals with both GS2 and GS3
     if(-e "cgi-bin" && -d "cgi-bin") { # GS2
     chdir("cgi-bin");
+    if(defined $ENV{'GSDLARCH'}) {
+        chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
+    } else {
+        chdir($ENV{'GSDLOS'});
+    }
     } else { # iis6_mode is not applicable for Greenstone 3
     $iis6_mode = 0;

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

@@ -495 +495 @@
     $self->{'library_url_suffix'} = $library_url;
 
-    unshift(@INC, "$ENV{'GSDLHOME'}/cgi-bin"); # This is OK on Windows
+    my $cgibin = "cgi-bin/$ENV{'GSDLOS'}";
+    $cgibin = $cgibin.$ENV{'GSDLARCH'} if defined $ENV{'GSDLARCH'};
+
+    unshift(@INC, "$ENV{'GSDLHOME'}/$cgibin"); # This is OK on Windows
     unshift(@INC, "$ENV{'GSDLHOME'}/perllib");
     unshift(@INC, "$ENV{'GSDLHOME'}/perllib/cpan");

main/trunk/greenstone2/cgi-bin/image-server.pl

@@ -14 +14 @@
 if ($iis6_mode)
 {
-    # Change into cgi-bin directory
+    # Change into cgi-bin\<OS> directory
     chdir("cgi-bin");
+    if(defined $ENV{'GSDLARCH'}) {
+    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
+    } else {
+    chdir($ENV{'GSDLOS'});
+    }
 }
 

main/trunk/greenstone2/cgi-bin/index-server.pl

@@ -22 +22 @@
 if ($iis6_mode)
 {
-    # Change into cgi-bin directory
+    # Change into cgi-bin\<OS> directory
     chdir("cgi-bin");
+    if(defined $ENV{'GSDLARCH'}) {
+    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
+    } else {
+    chdir($ENV{'GSDLOS'});
+    }
 }
 

main/trunk/greenstone2/cgi-bin/metadata-server.pl

@@ -23 +23 @@
 if ($iis6_mode)
 {
-    # Change into cgi-bin directory
+    # Change into cgi-bin\<OS> directory
     chdir("cgi-bin");
+    if(defined $ENV{'GSDLARCH'}) {
+    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
+    } else {
+    chdir($ENV{'GSDLOS'});
+    }
 }