Changeset 28663 for main/trunk/greenstone2/bin/script/txt2jdb.pl

Timestamp:

2013-11-20T18:22:16+13:00 (10 years ago)

Author:

ak19

Message:

Fixing it up so the number of commandline arguments and the way they're handled match txt2db (gdb version).

File:

• main/trunk/greenstone2/bin/script/txt2jdb.pl (modified) (3 diffs)

main/trunk/greenstone2/bin/script/txt2jdb.pl

@@ -34 +34 @@
 
 # Save you having to type in the mouthful:
-#  cat file.txt | java -cp $GSDLHOME/lib/java/jdbm.jar:$GSDLHOME/bin/java/JDBMWrapper.jar Txt2Jdb jdbm-file.jdb
+#  (cat file.txt |) java -cp $GSDLHOME/lib/java/jdbm.jar:$GSDLHOME/bin/java/JDBMWrapper.jar Txt2Jdb jdbm-file.jdb
 #
 # for Unix, or
 #
-#  type file.txt | java -cp %GSDLHOME%\lib\java\jdbm.jar;$GSDLHOME\bin\java/\DBMWrapper.jar Txt2Jdb jdbm-file.jdb
+#  (type file.txt |) java -cp %GSDLHOME%\lib\java\jdbm.jar;$GSDLHOME\bin\java/\DBMWrapper.jar Txt2Jdb jdbm-file.jdb
 #
 # for Windows.
@@ -55 +55 @@
 use File::Basename;
 
-if (scalar(@ARGV)< 1) {
+if (scalar(@ARGV) != 1) {
     my ($progname,$dir) = &File::Basename::fileparse($0);
 
@@ -77 +77 @@
 }
 
-#&util::envvar_prepend("CLASSPATH",$jdbm_jar);
-#&util::envvar_prepend("CLASSPATH",$jdbmwrapper_jar);
-
-my $cmd = ($ENV{'GSDLOS'} =~ m/windows/) ? "type" : "cat";
-$cmd .= " $ARGV[0] | java -cp \"$classpath\" Txt2Jdb ".$ARGV[1];
+my $cmd = "java -cp \"$classpath\" Txt2Jdb ".$ARGV[0];
 
 if (system($cmd)!=0) {