Changeset 21298 for gs3-extensions


Ignore:
Timestamp:
2009-12-07T15:40:20+13:00 (14 years ago)
Author:
davidb
Message:

Switch to using -classpath rather than -jar, so can control where imageis.ImageIS looks for its VSprop.properities file

Location:
gs3-extensions/pharos/trunk/bin/script
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

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

    r21269 r21298  
    126126   
    127127    my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_SRC_HOME'},"pharos-imageis.jar");
    128     #my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_SRC_HOME'}, "ImageIS.jar");
    129     my $java_cmd = "java -jar \"$jar_filename\" \"$add_this_filename\"";
     128
     129
     130    my $prop_dir = &util::filename_cat($ENV{'PHAROSIS_SRC_HOME'},"classes");
     131
     132    &util::envvar_append("CLASSPATH",$prop_dir);
     133    &util::envvar_append("CLASSPATH",$jar_filename);
     134
     135    my $java_cmd = "java imageis.ImageIS \"$add_this_filename\"";
     136
     137    print STDERR "\n\n***** java cmd = $java_cmd\n\n"
     138;
     139
    130140
    131141    print "Ingesting $dstfile\n";

  • gs3-extensions/pharos/trunk/bin/script/pharos-imageis-delete.pl

    r21259 r21298  
    9898   
    9999    my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_SRC_HOME'},"ImageIS.jar");
    100     my $java_cmd = "java -jar \"$jar_filename\" \"$del_this_filename\"";
     100    my $prop_dir = &util::filename_cat($ENV{'PHAROSIS_SRC_HOME'},"classes");
     101
     102    &util::envvar_append("CLASSPATH",$prop_dir);
     103    &util::envvar_append("CLASSPATH",$jar_filename);
     104
     105    my $java_cmd = "java imageis.ImageIS \"$del_this_filename\"";
    101106
    102107    print "Deleting $docid\n";

  • gs3-extensions/pharos/trunk/bin/script/pharos-imageis-query.pl

    r21269 r21298  
    9898    my $jar_filename = &util::filename_cat($ENV{'PHAROSIS_SRC_HOME'},"pharos-imageis.jar");
    9999   
    100     my $java_cmd = "java -jar \"$jar_filename\" \"$query_this_filename\"";
    101     print STDERR "java_cmd = $java_cmd\n";
     100    my $prop_dir = &util::filename_cat($ENV{'PHAROSIS_SRC_HOME'},"classes");
     101
     102    &util::envvar_append("CLASSPATH",$prop_dir);
     103    &util::envvar_append("CLASSPATH",$jar_filename);
     104
     105    my $java_cmd = "java imageis.ImageIS \"$query_this_filename\"";
     106
     107    # print STDERR "java_cmd = $java_cmd\n";
    102108
    103109    print "Querying $docid\n";
Note: See TracChangeset for help on using the changeset viewer.