Changeset 10704

Timestamp:

2005-10-07T10:01:18+13:00 (19 years ago)

Author:

kjdon

Message:

more fixes from jens

File:

• trunk/gsdl/bin/script/expand_macros.pl (modified) (6 diffs)

trunk/gsdl/bin/script/expand_macros.pl

@@ -3 +3 @@
 ##################################################################################
 #                                                                                #
-# expand_macros.pl -- recursively expand greenstone macros / 1080805 - 4010905   #
+# expand_macros.pl -- recursively expand greenstone macros / 1080805 - 1050905   #
 #                                                                                #
 # Copyright (C) 2005 Jens Wille <j_wille at gmx.net>                             #
@@ -63 +63 @@
 # KNOWN BUGS:
 #
-# - (paged-)read will quit the program if not scrolled until the end of the
-#   (sufficiently large) file
+# - for a sufficiently large file (> 12288 bytes == 12 k) (paged-)read will quit
+#   the program if not scrolled until the end of the file => SIGPIPE: broken pipe!
+#   SOLVED: the PIPE signal will simply be IGNOREd
 #
 
@@ -84 +85 @@
 
 my $NAME    = basename $0;
-my $VERSION = '0.2';
+my $VERSION = '0.21';
 
 
@@ -135 +136 @@
   'interactive' => 0,
   'paged'       => 0,
-  'pager'       => 'less',
-  'histfile'    => catfile(tmpdir, 'expand_macros.hist'),
+  'pager'       => $ENV{'PAGER'} || 'less',
+  'histfile'    => catfile($ENV{'GSDLTMPDIR'} || tmpdir, 'expand_macros.hist'),
   'histsize'    => 100,
   'macro_dirs'  => [catdir($ENV{'GSDLHOME'}, 'macros')],
@@ -356 +357 @@
   # interactive browse mode
 
+  # ignore 'broken pipe' error
+  $SIG{'PIPE'} = 'IGNORE';
+
   # get the pager executable
   # no need to test if not in "paged" mode
@@ -1109 +1113 @@
         $ARG{'paged'}      = 1 if $paged;
 
-        print_output("$file:\n\n", @lines);
+        #print_output("$file:\n\n", @lines);
+        print_output(@lines);
 
         $ARG{'paged'}      = $previous_paged;