Sfoglia il codice sorgente

Bump version number to 0.35-cvs, and remove the wrongly placed 'v', also
move get_default_config_settings() to the constructor

Morten Brix Pedersen 24 anni fa
parent
commit
dda466822f
2 ha cambiato i file con 10 aggiunte e 8 eliminazioni
  1. 8 6
      modules/Pisg.pm
  2. 2 2
      modules/Pisg/HTMLGenerator.pm

+ 8 - 6
modules/Pisg.pm

@@ -2,7 +2,7 @@ package Pisg;
 
 
 # Documentation(POD) for this module is found at the end of the file.
 # Documentation(POD) for this module is found at the end of the file.
 
 
-# Copyright (C) 2001  <Morten Brix Pedersen> - morten@wtf.dk
+# Copyright (C) 2001-2002  <Morten Brix Pedersen> - morten@wtf.dk
 #
 #
 # This program is free software; you can redistribute it and/or modify
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # it under the terms of the GNU General Public License as published by
@@ -35,6 +35,9 @@ sub new
         tmps => {},
         tmps => {},
     };
     };
 
 
+    # Set the default configuration settings.
+    get_default_config_settings($self);
+
     # Import common functions in Pisg::Common
     # Import common functions in Pisg::Common
     require Pisg::Common;
     require Pisg::Common;
     Pisg::Common->import();
     Pisg::Common->import();
@@ -47,10 +50,7 @@ sub run
 {
 {
     my $self = shift;
     my $self = shift;
 
 
-    # Set the default configuration settings.
-    $self->get_default_config_settings();
-
-    print "pisg $self->{cfg}->{version} - Perl IRC Statistics Generator\n\n"
+    print "pisg v$self->{cfg}->{version} - Perl IRC Statistics Generator\n\n"
         unless ($self->{cfg}->{silent});
         unless ($self->{cfg}->{silent});
 
 
     # Init the configuration file (aliases, ignores, channels, etc)
     # Init the configuration file (aliases, ignores, channels, etc)
@@ -185,7 +185,7 @@ sub get_default_config_settings
 
 
         # Developer stuff
         # Developer stuff
 
 
-        version => "v0.34-cvs",
+        version => "0.35-cvs",
     };
     };
 
 
     # Parse the optional overriden configuration variables
     # Parse the optional overriden configuration variables
@@ -468,6 +468,8 @@ Pisg - Perl IRC Statistics Generator main module
         override_cfg => { network => 'MyNetwork', format => 'eggdrop' }
         override_cfg => { network => 'MyNetwork', format => 'eggdrop' }
     );
     );
 
 
+    $pisg->run();
+
 =head1 DESCRIPTION
 =head1 DESCRIPTION
 
 
 C<Pisg> is a statistic generator for IRC logfiles or the like, delivering
 C<Pisg> is a statistic generator for IRC logfiles or the like, delivering

+ 2 - 2
modules/Pisg/HTMLGenerator.pm

@@ -245,7 +245,7 @@ sub _htmlfooter
     my $self = shift;
     my $self = shift;
     print OUTPUT <<HTML;
     print OUTPUT <<HTML;
 <span class="small">
 <span class="small">
-Stats generated by <a href="http://pisg.sourceforge.net/" title="Go to the pisg homepage" class="background">pisg</a> $self->{cfg}->{version}<br />
+Stats generated by <a href="http://pisg.sourceforge.net/" title="Go to the pisg homepage" class="background">pisg</a> v$self->{cfg}->{version}<br />
 pisg by <a href="http://www.wtf.dk/hp/" title="Go to the authors homepage" class="background">Morten Brix Pedersen</a> and others<br />
 pisg by <a href="http://www.wtf.dk/hp/" title="Go to the authors homepage" class="background">Morten Brix Pedersen</a> and others<br />
 Stats generated in $self->{stats}->{processtime}
 Stats generated in $self->{stats}->{processtime}
 </span>
 </span>
@@ -1683,7 +1683,7 @@ Morten Brix Pedersen <morten@wtf.dk>
 
 
 =head1 COPYRIGHT
 =head1 COPYRIGHT
 
 
-Copyright (C) 2001 Morten Brix Pedersen. All rights resereved.
+Copyright (C) 2001-2002 Morten Brix Pedersen. All rights reserved.
 This program is free software; you can redistribute it and/or modify it
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GPL, license is included with the distribution of
 under the terms of the GPL, license is included with the distribution of
 this file.
 this file.