Changeset 24872


Ignore:
Timestamp:
12/09/11 16:25:34 (9 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:
8 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/cgi-bin/build-server.pl

    r24074 r24872  
    2323if ($iis6_mode)
    2424{
    25     # Change into cgi-bin directory
     25    # Change into cgi-bin\<OS> directory
    2626    chdir("cgi-bin");
     27    if(defined $ENV{'GSDLARCH'}) {
     28    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
     29    } else {
     30    chdir($ENV{'GSDLOS'});
     31    }
    2732}
    2833
  • main/trunk/greenstone2/cgi-bin/experimental-ocr-server.pl

    r23765 r24872  
    2626if ($iis6_mode)
    2727{
    28     # Change into cgi-bin directory
     28    # Change into cgi-bin\<OS> directory
    2929    chdir("cgi-bin");
     30    if(defined $ENV{'GSDLARCH'}) {
     31    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
     32    } else {
     33    chdir($ENV{'GSDLOS'});
     34    }
    3035}
    3136
  • main/trunk/greenstone2/cgi-bin/explode-server.pl

    r23481 r24872  
    2222if ($iis6_mode)
    2323{
    24     # Change into cgi-bin directory
     24    # Change into cgi-bin\<OS> directory
    2525    chdir("cgi-bin");
     26    if(defined $ENV{'GSDLARCH'}) {
     27    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
     28    } else {
     29    chdir($ENV{'GSDLOS'});
     30    }
    2631}
    2732
  • main/trunk/greenstone2/cgi-bin/gliserver.pl

    r24292 r24872  
    2525if ($iis6_mode)
    2626{
    27     # Change into cgi-bin directory - need to ensure it exists, since gliserver deals with both GS2 and GS3
     27    # Change into cgi-bin\<OS> directory - need to ensure it exists, since gliserver deals with both GS2 and GS3
    2828    if(-e "cgi-bin" && -d "cgi-bin") { # GS2
    2929    chdir("cgi-bin");
     30    if(defined $ENV{'GSDLARCH'}) {
     31        chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
     32    } else {
     33        chdir($ENV{'GSDLOS'});
     34    }
    3035    } else { # iis6_mode is not applicable for Greenstone 3
    3136    $iis6_mode = 0;
  • main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

    r23796 r24872  
    495495    $self->{'library_url_suffix'} = $library_url;
    496496
    497     unshift(@INC, "$ENV{'GSDLHOME'}/cgi-bin"); # This is OK on Windows
     497    my $cgibin = "cgi-bin/$ENV{'GSDLOS'}";
     498    $cgibin = $cgibin.$ENV{'GSDLARCH'} if defined $ENV{'GSDLARCH'};
     499
     500    unshift(@INC, "$ENV{'GSDLHOME'}/$cgibin"); # This is OK on Windows
    498501    unshift(@INC, "$ENV{'GSDLHOME'}/perllib");
    499502    unshift(@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
  • main/trunk/greenstone2/cgi-bin/image-server.pl

    r19293 r24872  
    1414if ($iis6_mode)
    1515{
    16     # Change into cgi-bin directory
     16    # Change into cgi-bin\<OS> directory
    1717    chdir("cgi-bin");
     18    if(defined $ENV{'GSDLARCH'}) {
     19    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
     20    } else {
     21    chdir($ENV{'GSDLOS'});
     22    }
    1823}
    1924
  • main/trunk/greenstone2/cgi-bin/index-server.pl

    r23475 r24872  
    2222if ($iis6_mode)
    2323{
    24     # Change into cgi-bin directory
     24    # Change into cgi-bin\<OS> directory
    2525    chdir("cgi-bin");
     26    if(defined $ENV{'GSDLARCH'}) {
     27    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
     28    } else {
     29    chdir($ENV{'GSDLOS'});
     30    }
    2631}
    2732
  • main/trunk/greenstone2/cgi-bin/metadata-server.pl

    r23467 r24872  
    2323if ($iis6_mode)
    2424{
    25     # Change into cgi-bin directory
     25    # Change into cgi-bin\<OS> directory
    2626    chdir("cgi-bin");
     27    if(defined $ENV{'GSDLARCH'}) {
     28    chdir($ENV{'GSDLOS'}.$ENV{'GSDLARCH'});
     29    } else {
     30    chdir($ENV{'GSDLOS'});
     31    }
    2732}
    2833
Note: See TracChangeset for help on using the changeset viewer.