Changeset 30683 for main/trunk

Timestamp:

2016-08-05T19:39:07+12:00 (8 years ago)

Author:

ak19

Message:

Undoing accidental commits of rev 30681.

Location:

main/trunk/greenstone2

Files:

• bin/script/gsConvert.pl (modified) (1 diff)
• bin/script/wvware.pl (modified) (1 diff)
• collect/demo/etc/collect.cfg (modified) (2 diffs)
• etc/main.cfg (modified) (3 diffs)
• runtime-src/src/recpt/gsdl_modules_cfg.h (modified) (1 diff)

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

@@ -531 +531 @@
     my $launch_cmd = "\"".&util::get_perl_exec()."\" -S wvware.pl \"$input_filename\" \"$output_filestem\" \"$faillogfile\" $verbosity $timeout";    
 
-    print STDERR "***** wvware launch cmd = $launch_cmd\n";
+#    print STDERR "***** wvware launch cmd = $launch_cmd\n";
 
     $wvware_status = system($launch_cmd)/256;

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

@@ -217 +217 @@
     if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);
 
-    print STDERR "***** wvware.pl launching wvware with CMD:\n\t$cmd\n";
+#    print STDERR "***** wvware.pl launching wvware with CMD:\n\t$cmd\n";
 
     # execute the command

main/trunk/greenstone2/collect/demo/etc/collect.cfg

@@ -14 +14 @@
 
 plugin  GreenstoneXMLPlugin
-plugin  HTMLPlugin -description_tags
+plugin  HTMLPlugin -description_tags 
 # following two plugins not needed for the demo collection, but are useful to
 # include for tutorial purposes
@@ -33 +33 @@
 classify    List -sort_leaf_nodes_using dc.Title -metadata dls.Organization -bookshelf_type always -partition_type_within_level constant_size
 
-classify    List -metadata dls.Keyword -buttonname Howto -partition_type_within_level constant_size
+classify    List -metadata dls.Keyword -partition_type_within_level constant_size -buttonname Howto
 
 format CL4VList "<td>[link][icon][/link]</td><td>[link][dls.Keyword][/link]"

main/trunk/greenstone2/etc/main.cfg

@@ -10 +10 @@
 # will be disabled.
 maintainer      NULL
-
-# GTI
-translator  enabled
 
 # Outgoing (SMTP) mail server for this Greenstone installation.
@@ -26 +23 @@
 # Set status to "enabled" if you want the Maintenance and
 # Administration facility to be available.
-status      enabled
+status      disabled
 
 # Set collector to "enabled" if you want the "collector"
@@ -302 +299 @@
 # If you want an intermediate page to warn users that they've clicked on 
 # an external link, then uncomment the following line
-cgiarg      shortname=el argdefault=prompt
-
+#cgiarg     shortname=el argdefault=prompt
+

main/trunk/greenstone2/runtime-src/src/recpt/gsdl_modules_cfg.h

@@ -56 +56 @@
 #define GSDL_USE_DEPOSITOR_ACTION
 #define GSDL_USE_EXTLINK_ACTION
-#define GSDL_USE_GTI_ACTION
+#undef GSDL_USE_GTI_ACTION
 
 #ifdef ENABLE_MGPP