Show
Ignore:
Timestamp:
04.12.2009 10:43:02 (10 years ago)
Author:
davidb
Message:

Elimination of IMAGEIS environment variable. Everything is now based around PHAROSIS_HOME

Location:
gs3-extensions/pharos/trunk
Files:
7 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/pharos/trunk/bin/script/pharos-imageis-add.pl

    r21242 r21250  
    2929    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'}; 
    3030    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
    31     die "IMAGEISHOME not set\n" unless defined $ENV{'IMAGEISHOME'}; 
     31    die "PHAROSIS_HOME not set\n" unless defined $ENV{'PHAROSIS_HOME'}; 
    3232    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    3333} 
     
    9393     
    9494    my $add_template_filename 
    95     = &util::filename_cat($ENV{'IMAGEISHOME'},"templates","add_file.xml"); 
     95    = &util::filename_cat($ENV{'PHAROSIS_HOME'},"etc", "templates","add_file.xml"); 
    9696    my $add_this_filename = &util::filename_cat($tmp_dir,"add_file.xml"); 
    9797     
     
    124124     
    125125     
    126     my $jar_filename = &util::filename_cat($ENV{'IMAGEISHOME'},"ImageIS.jar"); 
     126    my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_HOME'},"ImageIS.jar"); 
    127127    my $java_cmd = "java -jar \"$jar_filename\" \"$add_this_filename\""; 
    128128    #my $java_cmd = "java -cp /research/kjdon/home/pharos-greenstone3/ext/pharos/decompiled:/research/kjdon/home/pharos-greenstone3/ext/pharos/cmdline-api-srcpack/ImageIS.jar:/research/kjdon/home/pharos-greenstone3/ext/pharos MyImageIS $add_this_filename"; 
  • gs3-extensions/pharos/trunk/bin/script/pharos-imageis-delete.pl

    r21242 r21250  
    2929    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'}; 
    3030    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
    31     die "IMAGEISHOME not set\n" unless defined $ENV{'IMAGEISHOME'}; 
     31    die "PHAROSIS_HOME not set\n" unless defined $ENV{'PHAROSIS_HOME'}; 
    3232    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    3333} 
     
    6666     
    6767    my $del_template_filename 
    68     = &util::filename_cat($ENV{'IMAGEISHOME'},"templates","del_id.xml"); 
     68    = &util::filename_cat($ENV{'PHAROSIS_HOME'},"etc", "templates","del_id.xml"); 
    6969    my $del_this_filename = &util::filename_cat($tmp_dir,"del_id.xml"); 
    7070     
     
    9797     
    9898     
    99     my $jar_filename = &util::filename_cat($ENV{'IMAGEISHOME'},"ImageIS.jar"); 
     99    my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_HOME'},"ImageIS.jar"); 
    100100    my $java_cmd = "java -jar \"$jar_filename\" \"$del_this_filename\""; 
    101101 
  • gs3-extensions/pharos/trunk/bin/script/pharos-imageis-identify.pl

    r21242 r21250  
    2929    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'}; 
    3030    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
    31     die "IMAGEISHOME not set\n" unless defined $ENV{'IMAGEISHOME'}; 
     31    die "PHAROSIS_HOME not set\n" unless defined $ENV{'PHAROSIS_HOME'}; 
    3232    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    3333} 
  • gs3-extensions/pharos/trunk/bin/script/pharos-imageis-query.pl

    r21242 r21250  
    2929    die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'}; 
    3030    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
    31     die "IMAGEISHOME not set\n" unless defined $ENV{'IMAGEISHOME'}; 
     31    die "PHAROSIS_HOME not set\n" unless defined $ENV{'PHAROSIS_HOME'}; 
    3232    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    3333} 
     
    6565     
    6666    my $query_template_filename 
    67     = &util::filename_cat($ENV{'IMAGEISHOME'},"templates","query_id.xml"); 
     67    = &util::filename_cat($ENV{'PHAROSIS_HOME'},"templates","query_id.xml"); 
    6868    my $query_this_filename = &util::filename_cat($tmp_dir,"query_id.xml"); 
    6969     
     
    9696     
    9797     
    98     my $jar_filename = &util::filename_cat($ENV{'IMAGEISHOME'},"ImageIS.jar"); 
     98    my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_HOME'},"ImageIS.jar"); 
    9999    my $java_cmd = "java -jar \"$jar_filename\" \"$query_this_filename\""; 
    100100 
  • gs3-extensions/pharos/trunk/bin/script/pharos-start-derby.sh

    r20983 r21250  
    11#!/bin/bash 
    22 
    3 derbyjar_dir=$PHAROSHOME/WEB-INF/lib 
     3derbyjar_dir=$PHAROSIS_HOME/WEB-INF/lib 
    44 
    55java "-Dderby.system.home=$DERBYDB_HOME" \ 
  • gs3-extensions/pharos/trunk/bin/script/pharos-stop-derby.sh

    r20983 r21250  
    11#!/bin/bash 
    22 
    3 derbyjar_dir=$PHAROSHOME/WEB-INF/lib 
     3derbyjar_dir=$PHAROSIS_HOME/WEB-INF/lib 
    44 
    55java "-Dderby.system.home=$DERBYDB_HOME" \ 
  • gs3-extensions/pharos/trunk/setup.bash

    r21249 r21250  
    2323fi 
    2424 
    25 export PHAROSSRCHOME=`pwd` 
    26 export PHAROSHOME=$PHAROSSRCHOME/web 
     25export PHAROSIS_SRC_HOME=`pwd` 
     26export PHAROSIS_HOME=$PHAROSIS_SRC_HOME/web 
    2727export PHAROSOS=$GSDLOS 
    2828 
    29 export IMAGEISHOME=`pwd` 
     29export PATH=$PHAROSIS_SRC_HOME/bin/script:$PHAROSIS_SRC_HOME/bin/$PHAROSOS:$PATH 
    3030 
    31 export PATH=$PHAROSSRCHOME/bin/script:$PHAROSSRCHOME/bin/$PHAROSOS:$PATH 
    32  
    33 export DERBYDB_HOME=$PHAROSHOME/derbyDB 
     31export DERBYDB_HOME=$PHAROSIS_HOME/derbyDB 
    3432 
    3533echo ""