modified version check

diff --git a/selfforum-cgi/shared/Template/Archive.pm b/selfforum-cgi/shared/Template/Archive.pm
index d3706a43d88647bc297360fb4346bcc9fa20c034..3bc080767aee621337b9ef29a635d19cfd937cea 100644 (file)
--- 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       <nd@o3media.de>, 2001-06-16                    #
-#              Frank Schoenmann <fs@tower.de>,   2001-06-08                    #
+# Authors:     André Malo <nd@o3media.de>                                      #
+#              Frank Schönmann <fs@tower.de>                                   #
 #                                                                              #
 # 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 518356159346c7bad5712b17787a95300ea95b86..f4223f9e9f4af1586ccc968788c63b3a2e1e9952 100644 (file)
--- 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 <nd@o3media.de>, 2001-06-16                          #
+# Authors:     André Malo <nd@o3media.de>                                      #
 #                                                                              #
 # 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 7f0d94022fcba6058dee0c672e8b3c1107ea786c..3fafa4a081a5edb76beef0f4b095fc371e4fd169 100644 (file)
--- 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       <nd@o3media.de>, 2001-06-16                    #
+# Authors:     André Malo <nd@o3media.de>                                      #
 #                                                                              #
 # 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 626815b5f995c10b7d52cbfb57f782ae8ccbf913..01100a5d272968d1b02d12b49b2dc32a644e42cc 100644 (file)
--- 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 <nd@o3media.de>, 2001-06-16                          #
+# Authors:     André Malo <nd@o3media.de>                                      #
 #                                                                              #
 # 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 8d1d8ecdb093bc04c126b82806dc7c33b87e53e5..3fb8e2d059a2813e6eb32a2933f282e3f864ec3c 100644 (file)
--- 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 <nd@o3media.de>, 2001-06-16                          #
+# Authors:     André Malo <nd@o3media.de>                                      #
 #                                                                              #
 # 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 c47f28c3ee4a577d8b411b0978cfcdba8eca96fa..f4ee5b28086f81ddfda4728233ebf04681277a1d 100644 (file)
--- 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 <nd@o3media.de>, 2001-06-16                          #
+# Authors:     André Malo <nd@o3media.de>                                      #
 #                                                                              #
 # 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'}
 
 ################################################################################
 #