Changeset 21250 for gs3-extensions/pharos/trunk/bin/script/pharos-imageis-add.pl

Timestamp:

2009-12-04T10:43:02+13:00 (14 years ago)

Author:

davidb

Message:

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

File:

• gs3-extensions/pharos/trunk/bin/script/pharos-imageis-add.pl (modified) (3 diffs)

gs3-extensions/pharos/trunk/bin/script/pharos-imageis-add.pl

@@ -29 +29 @@
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
     die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
-    die "IMAGEISHOME not set\n" unless defined $ENV{'IMAGEISHOME'};
+    die "PHAROSIS_HOME not set\n" unless defined $ENV{'PHAROSIS_HOME'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }
@@ -93 +93 @@
     
     my $add_template_filename
-    = &util::filename_cat($ENV{'IMAGEISHOME'},"templates","add_file.xml");
+    = &util::filename_cat($ENV{'PHAROSIS_HOME'},"etc", "templates","add_file.xml");
     my $add_this_filename = &util::filename_cat($tmp_dir,"add_file.xml");
     
@@ -124 +124 @@
     
     
-    my $jar_filename = &util::filename_cat($ENV{'IMAGEISHOME'},"ImageIS.jar");
+    my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_HOME'},"ImageIS.jar");
     my $java_cmd = "java -jar \"$jar_filename\" \"$add_this_filename\"";
     #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";