Changeset 22518

Timestamp:

28.07.2010 15:06:55 (6 weeks ago)

Author:

kjdon

Message:

copied the pager code out of printusage and added it to print_single_{plugin,classifier} so that pluginfo and classinfo go to less

Location:

main/trunk/greenstone2/bin/script

Files:

• classinfo.pl (modified) (1 diff)
• pluginfo.pl (modified) (1 diff)

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

@@ -214 +214 @@
     }
     else {
+
+        # this causes us to automatically send output to a pager, if one is
+        # set, AND our output is going to a terminal
+        # active state perl on windows doesn't do open(handle, "-|");
+        if ($ENV{'GSDLOS'} !~ /windows/ && -t STDOUT) {
+            my $pager = $ENV{"PAGER"};
+            if (! $pager) {$pager="(less || more)"}
+            my $pid = open(STDIN, "-|"); # this does a fork... see man perlipc(1)
+            if (!defined $pid) {
+                gsprintf(STDERR, "pluginfo.pl - can't fork: $!");
+            } else {
+                if ($pid != 0) { # parent (ie forking) process. child gets 0
+                    exec ($pager);
+                }
+            }
+            open(STDERR,">&STDOUT"); # so it's easier to pipe output
+        }
+
         &gsprintf(STDERR, "\n{classinfo.passing_options}\n\n");
         &gsprintf(STDERR, "{classinfo.option_types}:\n\n");

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

@@ -249 +249 @@
     }
     else {
+
+        # this causes us to automatically send output to a pager, if one is
+        # set, AND our output is going to a terminal
+        # active state perl on windows doesn't do open(handle, "-|");
+        if ($ENV{'GSDLOS'} !~ /windows/ && -t STDOUT) {
+            my $pager = $ENV{"PAGER"};
+            if (! $pager) {$pager="(less || more)"}
+            my $pid = open(STDIN, "-|"); # this does a fork... see man perlipc(1)
+            if (!defined $pid) {
+                gsprintf(STDERR, "pluginfo.pl - can't fork: $!");
+            } else {
+                if ($pid != 0) { # parent (ie forking) process. child gets 0
+                    exec ($pager);
+                }
+            }
+            open(STDERR,">&STDOUT"); # so it's easier to pipe output
+        }
+
         gsprintf(STDERR, "\n{pluginfo.passing_options}\n\n");
         gsprintf(STDERR, "{pluginfo.option_types}:\n\n");