svn commit: r1292934 - /httpd/docs-build/trunk/irc_factoids.pl

[rb...@apache.org]

Author: rbowen
Date: Thu Feb 23 20:10:19 2012
New Revision: 1292934

URL: http://svn.apache.org/viewvc?rev=1292934&view=rev
Log:
Reverts part of previous change - don't need the nick to send the
message in /msg

Modified:
    httpd/docs-build/trunk/irc_factoids.pl

Modified: httpd/docs-build/trunk/irc_factoids.pl
URL: http://svn.apache.org/viewvc/httpd/docs-build/trunk/irc_factoids.pl?rev=1292934&r1=1292933&r2=1292934&view=diff
==============================================================================
--- httpd/docs-build/trunk/irc_factoids.pl (original)
+++ httpd/docs-build/trunk/irc_factoids.pl Thu Feb 23 20:10:19 2012
@@ -4,10 +4,10 @@ use Getopt::Std;
 use Data::Dumper;
 use strict;
 
-our ( $opt_m, $opt_v, $opt_b );
+our ( $opt_m, $opt_v );
 our $VERSION = '0.01';
 
-getopts("m:v:b:");
+getopts("m:v:");
 HELP_MESSAGE('The -m option is required.') unless $opt_m;
 
 $opt_m =~ s/\.xml$//;
@@ -15,14 +15,11 @@ HELP_MESSAGE('File '. $opt_m . '.xml not
 
 my $file = $opt_m . '.xml';
 
-my $bot = $opt_b ? $opt_b : 'fajita';
-my $addr = $bot . ': ';
-
 my $xs = XML::Simple->new();
 my $xml = $xs->XMLin( $file );
 
-print $addr . "forget $opt_m\n";
-print $addr . "$opt_m is " . 'http://httpd.apache.org/docs/' . ( $opt_v ? $opt_v : 'current' ) . '/mod/' . $opt_m .  '.html' . "\n\n";
+print "forget $opt_m\n";
+print "$opt_m is " . 'http://httpd.apache.org/docs/' . ( $opt_v ? $opt_v : 'current' ) . '/mod/' . $opt_m .  '.html' . "\n\n";
 
 my @directives;
 foreach my $directive ( sort( keys %{ $xml->{directivesynopsis} } ) ) {
@@ -32,28 +29,29 @@ foreach my $directive ( sort( keys %{ $x
     my $desc = $d->{description}; $desc =~ s/[\r\n]/ /gs;
     my $name = $directive . ( $opt_v ? " $opt_v" : '' );
 
-    print $addr . "forget $name\n";
-    print $addr . "$name is ";
+    print "forget $name\n";
+    print "$name is ";
     print 'http://httpd.apache.org/docs/' . ( $opt_v ? $opt_v : 'current' ) . '/mod/' . $opt_m .  '.html#' . lc( $directive ) .  " - ";
     print $desc . "\n";
 
-    print $addr . "forget $name default\n";
+    print "forget $name default\n";
     if ( $d->{default} ) {
-        print $addr . "$name default is " . $d->{default} . "\n";
+        print "$name default is " . $d->{default} . "\n";
     } else {
-        print $addr . "$name default is <reply>$name has not default value";
+        print "$name default is <reply>$name has no default value\n";
     }
 
-    print $addr . "forget $name override\n";
+    print "forget $name override\n";
     if ( $d->{override} ) {
-        print $addr . "$name override is <reply>$name may be used in an .htaccess file if AllowOverride is set to ".$d->{override}."\n";
+        print "$name override is <reply>$name may be used in an .htaccess file if AllowOverride is set to ".$d->{override}."\n";
     } else {
-        print $addr . "$name override is <reply>$name may not be used in a .htaccess file\n";
+        print "$name override is <reply>$name may not be used in a .htaccess file\n";
     }
 
-    print $addr . "forget $name context\n";
-    print $addr . "$name context is <reply>$name may be used in the following contexts: ";
-    print ( join ', ', @{ $d->{contextlist}->{context} } ) . "\n";
+    print "forget $name context\n";
+    print "$name context is <reply>$name may be used in the following contexts: ";
+    my $contexts = ref( $d->{contextlist}->{context} ) ?  $d->{contextlist}->{context} : [ $d->{contextlist}->{context} ];
+    print ( join ', ', @{ $contexts } ) . "\n";
     print "\n\n";
 
 }