From 1783408d3a61b5bd23ee6e3bb637b6d92ac40490 Mon Sep 17 00:00:00 2001 From: ndparker <> Date: Wed, 25 Jul 2001 23:37:10 +0000 Subject: [PATCH] modified version check --- selfforum-cgi/shared/Template/Archive.pm | 25 +++++++++++++----------- selfforum-cgi/shared/Template/Forum.pm | 9 ++++++--- selfforum-cgi/shared/Template/Posting.pm | 9 ++++++--- selfforum-cgi/shared/Template/_conf.pm | 11 +++++++---- selfforum-cgi/shared/Template/_query.pm | 13 +++++++----- selfforum-cgi/shared/Template/_thread.pm | 9 ++++++--- 6 files changed, 47 insertions(+), 29 deletions(-) diff --git a/selfforum-cgi/shared/Template/Archive.pm b/selfforum-cgi/shared/Template/Archive.pm index d3706a4..3bc0807 100644 --- a/selfforum-cgi/shared/Template/Archive.pm +++ b/selfforum-cgi/shared/Template/Archive.pm @@ -4,8 +4,8 @@ package Template::Archive; # # # File: shared/Template/Archive.pm # # # -# Authors: Andre Malo , 2001-06-16 # -# Frank Schoenmann , 2001-06-08 # +# Authors: André Malo # +# Frank Schönmann # # # # Description: archive display # # # @@ -14,10 +14,9 @@ package Template::Archive; use strict; use vars qw( @EXPORT - $VERSION ); -use Lock qw(:READ); +use Lock; use Encode::Posting; use Encode::Plain; $Encode::Plain::utf8 = 1; use Posting::_lib qw( @@ -44,7 +43,11 @@ use Template::_thread; # # Version check # -$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +# last modified: +# $Date$ (GMT) +# by $Author$ +# +sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'} ################################################################################ # @@ -58,7 +61,6 @@ use base qw(Exporter); print_thread_as_HTML ); - ### print_overview_as_HTML () ################################################## # # archive entry @@ -190,6 +192,7 @@ sub print_year_as_HTML($$$) { # sub print_month_as_HTML($$$) { my ($mainfile, $tempfile, $param) = @_; + my $main = new Lock($mainfile); my $assign = $param->{'assign'}; @@ -198,7 +201,7 @@ sub print_month_as_HTML($$$) { # # check if XML file exists # - unless (-e $mainfile) { + unless (-f $main->filename) { print ${$template->scrap( $assign->{'error'}, { @@ -211,8 +214,8 @@ sub print_month_as_HTML($$$) { # # try locking and read/parse threads # - my ($threads, $locked); - unless ($locked = lock_file($mainfile) and $threads = get_all_threads($mainfile, KILL_DELETED)) { + my $threads; + unless ($main->lock (LH_SHARED) and $threads = get_all_threads($mainfile, KILL_DELETED)) { print ${$template->scrap( $assign->{'error'}, { @@ -221,7 +224,7 @@ sub print_month_as_HTML($$$) { )}; return; } - unlock_file($mainfile); + $main -> unlock; my $tmplparam = { $assign->{'year'} => $param->{'year'}, @@ -285,7 +288,7 @@ sub print_thread_as_HTML($$$) { # # check if XML file exists # - unless (-e $mainfile) { + unless (-f $mainfile) { print ${$template->scrap( $assign->{'error'}, { diff --git a/selfforum-cgi/shared/Template/Forum.pm b/selfforum-cgi/shared/Template/Forum.pm index 5183561..f4223f9 100644 --- a/selfforum-cgi/shared/Template/Forum.pm +++ b/selfforum-cgi/shared/Template/Forum.pm @@ -4,7 +4,7 @@ package Template::Forum; # # # File: shared/Template/Forum.pm # # # -# Authors: André Malo , 2001-06-16 # +# Authors: André Malo # # # # Description: print Forum main file to STDOUT # # # @@ -13,7 +13,6 @@ package Template::Forum; use strict; use vars qw( @EXPORT - $VERSION ); use Lock; @@ -30,7 +29,11 @@ use Template::_thread; # # Version check # -$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +# last modified: +# $Date$ (GMT) +# by $Author$ +# +sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'} ################################################################################ # diff --git a/selfforum-cgi/shared/Template/Posting.pm b/selfforum-cgi/shared/Template/Posting.pm index 7f0d940..3fafa4a 100644 --- a/selfforum-cgi/shared/Template/Posting.pm +++ b/selfforum-cgi/shared/Template/Posting.pm @@ -4,7 +4,7 @@ package Template::Posting; # # # File: shared/Template/Posting.pm # # # -# Authors: Andre Malo , 2001-06-16 # +# Authors: André Malo # # # # Description: show HTML formatted posting # # # @@ -13,7 +13,6 @@ package Template::Posting; use strict; use vars qw( @EXPORT - $VERSION ); use Encode::Posting; @@ -40,7 +39,11 @@ use XML::DOM; # # Version check # -$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +# last modified: +# $Date$ (GMT) +# by $Author$ +# +sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'} ################################################################################ # diff --git a/selfforum-cgi/shared/Template/_conf.pm b/selfforum-cgi/shared/Template/_conf.pm index 626815b..01100a5 100644 --- a/selfforum-cgi/shared/Template/_conf.pm +++ b/selfforum-cgi/shared/Template/_conf.pm @@ -4,7 +4,7 @@ package Template::_conf; # # # File: shared/Template/_conf.pm # # # -# Authors: André Malo , 2001-06-16 # +# Authors: André Malo # # # # Description: combine user and default config # # # @@ -13,14 +13,17 @@ package Template::_conf; use strict; use vars qw( @EXPORT - $VERSION ); ################################################################################ # # Version check # -$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +# last modified: +# $Date$ (GMT) +# by $Author$ +# +sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'} ################################################################################ # @@ -57,4 +60,4 @@ sub get_view_params ($) { # # -### end of Template::_conf ##################################################### +### end of Template::_conf ##################################################### \ No newline at end of file diff --git a/selfforum-cgi/shared/Template/_query.pm b/selfforum-cgi/shared/Template/_query.pm index 8d1d8ec..3fb8e2d 100644 --- a/selfforum-cgi/shared/Template/_query.pm +++ b/selfforum-cgi/shared/Template/_query.pm @@ -4,7 +4,7 @@ package Template::_query; # # # File: shared/Template/_query.pm # # # -# Authors: André Malo , 2001-06-16 # +# Authors: André Malo # # # # Description: compose a query string # # # @@ -13,14 +13,17 @@ package Template::_query; use strict; use vars qw( @EXPORT - $VERSION ); ################################################################################ # # Version check # -$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +# last modified: +# $Date$ (GMT) +# by $Author$ +# +sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'} ################################################################################ # @@ -40,7 +43,7 @@ use base qw(Exporter); # sub url_encode ($) { my $string = shift; - $string=~s/([^a-zA-Z\d_.-])/uc sprintf('%%%02x',ord($1))/eg; + $string=~s/([^a-zA-Z\d_.-])/uc sprintf('%%%02x' => ord($1))/eg; $string; } @@ -73,4 +76,4 @@ sub query_string ($) { # # -### end of Template::_query #################################################### +### end of Template::_query #################################################### \ No newline at end of file diff --git a/selfforum-cgi/shared/Template/_thread.pm b/selfforum-cgi/shared/Template/_thread.pm index c47f28c..f4ee5b2 100644 --- a/selfforum-cgi/shared/Template/_thread.pm +++ b/selfforum-cgi/shared/Template/_thread.pm @@ -4,7 +4,7 @@ package Template::_thread; # # # File: shared/Template/_thread.pm # # # -# Authors: Andre Malo , 2001-06-16 # +# Authors: André Malo # # # # Description: convert parsed thread to HTML # # # @@ -13,7 +13,6 @@ package Template::_thread; use strict; use vars qw( @EXPORT - $VERSION ); use Encode::Plain; $Encode::Plain::utf8 = 1; @@ -25,7 +24,11 @@ use Template::_query; # # Version check # -$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +# last modified: +# $Date$ (GMT) +# by $Author$ +# +sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'} ################################################################################ # -- 2.34.1