improved (?) the master lock. Now, if first trial fails, the file will be locked...

[selfforum.git] / selfforum-cgi / shared / Template / Archive.pm

diff --git a/selfforum-cgi/shared/Template/Archive.pm b/selfforum-cgi/shared/Template/Archive.pm
index ec5ee22cbd83d3df14d51caa895838b169eac3e6..d3706a43d88647bc297360fb4346bcc9fa20c034 100644 (file)
--- a/selfforum-cgi/shared/Template/Archive.pm
+++ b/selfforum-cgi/shared/Template/Archive.pm
@@ -4,13 +4,18 @@ package Template::Archive;
 #                                                                              #
 # File:        shared/Template/Archive.pm                                      #
 #                                                                              #
 #                                                                              #
 # File:        shared/Template/Archive.pm                                      #
 #                                                                              #

-# Authors:     Frank Schoenmann <fs@tower.de>, 2001-06-04                      #
+# Authors:     Andre Malo       <nd@o3media.de>, 2001-06-16                    #
+#              Frank Schoenmann <fs@tower.de>,   2001-06-08                    #

 #                                                                              #
 # Description: archive display                                                 #
 #                                                                              #
 ################################################################################
 
 use strict;
 #                                                                              #
 # Description: archive display                                                 #
 #                                                                              #
 ################################################################################
 
 use strict;

+use vars qw(
+  @EXPORT
+  $VERSION
+);

 
 use Lock qw(:READ);
 use Encode::Posting;
 
 use Lock qw(:READ);
 use Encode::Posting;


@@ -35,27 +40,144 @@ use Template;
 use Template::_conf;
 use Template::_thread;
 
 use Template::_conf;
 use Template::_thread;
 

+################################################################################
+#
+# Version check
+#
+$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+

 ################################################################################
 #
 # Export
 #
 use base qw(Exporter);
 ################################################################################
 #
 # Export
 #
 use base qw(Exporter);

-@Template::Archive::EXPORT = qw(
+@EXPORT = qw(
+    print_overview_as_HTML
+    print_year_as_HTML

     print_month_as_HTML
     print_thread_as_HTML
 );
 
 
     print_month_as_HTML
     print_thread_as_HTML
 );
 
 

+### print_overview_as_HTML () ##################################################
+#
+# archive entry
+#
+# Params: $arcdir     main archive directory
+#         $tempfile   template filename
+#         $param      hash reference
+# Return: -none-
+#
+sub print_overview_as_HTML($$$) {
+    my ($arcdir, $tempfile, $param) = @_;
+
+    my $assign = $param->{'assign'};
+
+    my $template = new Template $tempfile;
+
+    #
+    # archiveDocStart
+    #
+    print ${$template->scrap(
+        $assign->{'archiveDocStart'}
+    )};
+
+    #
+    # globbing to find year directories
+    #
+    for (<$arcdir????>) {
+        s/$arcdir//;
+        print ${$template->scrap(
+            $assign->{'archiveDocEntry'},
+            {
+                $assign->{'year'}   => $_
+            }
+
+        )};
+    }
+
+#   for (my $month = 1; $month <= 12; $month++) {
+#       if (-e $yeardir.$month.'/') {
+#           print ${$template->scrap(
+#               $assign->{'yearDocEntry'},
+#               {
+#                   $assign->{'year'}       => $param->{'year'},
+#                   $assign->{'month'}      => $month,
+#                   $assign->{'monthName'}  => month($month)
+#               }
+#           )};
+#       }
+#   }
+
+    #
+    # archiveDocEnd
+    #
+    print ${$template->scrap(
+        $assign->{'archiveDocEnd'}
+    )};
+}
+

 ### print_year_as_HTML () ######################################################
 #
 # yearly overview over months
 #
 ### print_year_as_HTML () ######################################################
 #
 # yearly overview over months
 #

-# Params:
+# Params: $yeardir    directory, which contains month directories

 #         $tempfile   template filename
 #         $param      hash reference
 # Return: -none-
 #
 #         $tempfile   template filename
 #         $param      hash reference
 # Return: -none-
 #

+sub print_year_as_HTML($$$) {
+    my ($yeardir, $tempfile, $param) = @_;
+
+    my $assign = $param->{'assign'};

 
 

+    my $template = new Template $tempfile;
+
+    #
+    # check if this year's archive exist
+    #
+    unless (-e $yeardir) {
+        print ${$template->scrap(
+            $assign->{'error'},
+            {
+                $assign->{'errorText'}  => "Es existieren keine Nachrichten für dieses Jahr."
+            }
+        )};
+    }
+
+    my $tmplparam = {
+            $assign->{'year'}           => $param->{'year'},
+    };
+
+    #
+    # yearDocStart
+    #
+    print ${$template->scrap(
+        $assign->{'yearDocStart'},
+        $tmplparam
+    )};
+
+    for (my $month = 1; $month <= 12; $month++) {
+        if (-e $yeardir.$month.'/') {
+            print ${$template->scrap(
+                $assign->{'yearDocEntry'},
+                {
+                    $assign->{'year'}       => $param->{'year'},
+                    $assign->{'month'}      => $month,
+                    $assign->{'monthName'}  => month($month)
+                }
+            )};
+        }
+    }
+
+    #
+    # yearDocEnd
+    #
+    print ${$template->scrap(
+        $assign->{'yearDocEnd'},
+        $tmplparam
+    )};
+}

 
 ### print_month_as_HTML () #####################################################
 #
 
 ### print_month_as_HTML () #####################################################
 #


@@ -73,7 +195,33 @@ sub print_month_as_HTML($$$) {
 
     my $template = new Template $tempfile;
 
 
     my $template = new Template $tempfile;
 

-    my $threads = get_all_threads($mainfile, KILL_DELETED);
+    #
+    # check if XML file exists
+    #
+    unless (-e $mainfile) {
+        print ${$template->scrap(
+            $assign->{'error'},
+            {
+                $assign->{'errorText'}  => "Es existieren keine Nachrichten für diesen Monat."
+            }
+        )};
+        return;
+    }
+
+    #
+    # try locking and read/parse threads
+    #
+    my ($threads, $locked);
+    unless ($locked = lock_file($mainfile) and $threads = get_all_threads($mainfile, KILL_DELETED)) {
+        print ${$template->scrap(
+            $assign->{'error'},
+            {
+                $assign->{'errorText'}  => "Fehler beim Locking."
+            }
+        )};
+        return;
+    }
+    unlock_file($mainfile);

 
     my $tmplparam = {
             $assign->{'year'}           => $param->{'year'},
 
     my $tmplparam = {
             $assign->{'year'}           => $param->{'year'},


@@ -114,8 +262,6 @@ sub print_month_as_HTML($$$) {
         $assign->{'monthDocEnd'},
         $tmplparam
     )};
         $assign->{'monthDocEnd'},
         $tmplparam
     )};

-
-

 }
 
 ### print_thread_as_HTML () ####################################################
 }
 
 ### print_thread_as_HTML () ####################################################


@@ -136,6 +282,19 @@ sub print_thread_as_HTML($$$) {
 
     my $template = new Template $tempfile;
 
 
     my $template = new Template $tempfile;
 

+    #
+    # check if XML file exists
+    #
+    unless (-e $mainfile) {
+        print ${$template->scrap(
+            $assign->{'error'},
+            {
+                $assign->{'errorText'}  => "Der gewünschte Thread existiert nicht."
+            }
+        )};
+        return;
+    }
+

     my $view = get_view_params ({
         'adminDefault'  => $param->{'adminDefault'}
     });
     my $view = get_view_params ({
         'adminDefault'  => $param->{'adminDefault'}
     });


@@ -173,7 +332,8 @@ sub print_thread_as_HTML($$$) {
 
     print ${$template->scrap(
         $assign->{'threadDocStart'},
 
     print ${$template->scrap(
         $assign->{'threadDocStart'},

-        $tmplparam
+        $tmplparam,
+        1

     )};
 
     #
     )};
 
     #


@@ -184,7 +344,7 @@ sub print_thread_as_HTML($$$) {
         my $header = get_message_header($mnode);
         my $body = get_message_body($xml, 'm'.$_->{'mid'});
 
         my $header = get_message_header($mnode);
         my $body = get_message_body($xml, 'm'.$_->{'mid'});
 

-        my $text = message_field (
+        my $text = message_field(

             $body,
             {
                 'quoteChars'    => plain($view->{'quoteChars'}),
             $body,
             {
                 'quoteChars'    => plain($view->{'quoteChars'}),


@@ -206,7 +366,8 @@ sub print_thread_as_HTML($$$) {
                 $assign->{'msgCategory'}    => plain($header->{'category'}),
                 $assign->{'msgSubject'}     => plain($header->{'subject'}),
                 $assign->{'msgBody'}        => $text
                 $assign->{'msgCategory'}    => plain($header->{'category'}),
                 $assign->{'msgSubject'}     => plain($header->{'subject'}),
                 $assign->{'msgBody'}        => $text

-            }
+            },
+            1

         )};
     }
 
         )};
     }
 


@@ -215,14 +376,15 @@ sub print_thread_as_HTML($$$) {
     #
     print ${$template->scrap(
         $assign->{'threadDocEnd'},
     #
     print ${$template->scrap(
         $assign->{'threadDocEnd'},

-        $tmplparam
+        $tmplparam,
+        1

     )};
 }
 
 
     )};
 }
 
 

-# keep require happy
+# keep 'require' happy

 1;
 
 #
 #
 1;
 
 #
 #

-### end of Template::Archive ###################################################
+### end of Template::Archive ###################################################
\ No newline at end of file