_lib.pm: style changes

Handle::add_user_vote(), Handle::level_vote(): new
Handle.pm: fixes

diff --git a/selfforum-cgi/shared/Posting/Handle.pm b/selfforum-cgi/shared/Posting/Handle.pm
index 6873178c129d35d70b1fb5b1a89ee4437c77ead1..700a101f583cb75dbf4cf584a358993edd982185 100644 (file)
--- a/selfforum-cgi/shared/Posting/Handle.pm
+++ b/selfforum-cgi/shared/Posting/Handle.pm
@@ -4,10 +4,15 @@ package Posting::Handle;
 #                                                                              #
 # File:        shared/Posting/Handle.pm                                        #
 #                                                                              #
 #                                                                              #
 # File:        shared/Posting/Handle.pm                                        #
 #                                                                              #

-# Authors:     Frank Schoenmann <fs@tower.de>, 2001-03-08                      #
+# Authors:     Frank Schoenmann <fs@tower.de>, 2001-03-13                      #

 #                                                                              #
 # Description: Allow modifications of postings                                 #
 #                                                                              #
 #                                                                              #
 # Description: Allow modifications of postings                                 #
 #                                                                              #

+# Todo:        * Lock files before modification                                #
+#              * Change body in change_posting_body()                          #
+#              * Recursively set invisibility flag in main forum xml by        #
+#                hide_posting() and recover_posting()                          #
+#                                                                              #

 ################################################################################
 
 use strict;
 ################################################################################
 
 use strict;


@@ -15,13 +20,86 @@ use strict;
 use vars qw(@EXPORT);
 use base qw(Exporter);
 
 use vars qw(@EXPORT);
 use base qw(Exporter);
 

-@EXPORT = qw(hide_posting recover_posting modify_posting);
+@EXPORT = qw(hide_posting recover_posting modify_posting add_user_vote level_vote);

 
 

+use Lock qw(:READ);

 use Posting::_lib qw(get_message_node save_file get_all_threads
                      create_forum_xml_string);
 
 use XML::DOM;
 
 use Posting::_lib qw(get_message_node save_file get_all_threads
                      create_forum_xml_string);
 
 use XML::DOM;
 

+### add_user_vote () ###########################################################
+#
+# Increase number of user votes (only in thread file)
+#
+# Params: $forum  Path and filename of forum
+#         $tpath  Path to thread files
+#         \%info  Hash reference: 'thread', 'posting', 'percent'
+# Return: Status code (Bool)
+#
+# Todo:
+#  * Lock files before modification
+#
+sub add_user_vote()
+{
+    my ($forum, $tpath, $info) = @_;
+    my ($tid, $mid, $percent) = ($info->{'thread'},
+                                 $info->{'posting'},
+                                 $info->{'percent'});
+
+    # Thread
+    my $tfile = $tpath . '/t' . $tid . '.xml';
+
+    my $parser = new XML::DOM::Parser;
+    my $xml = $parser->parsefile($tfile);
+
+    my $mnode = get_message_node($xml, $tid, $mid);
+    my $votes = $mnode->getAttribute('votingUser') + 1;
+    $mnode->setAttribute('votingUser', $votes);
+
+    return save_file($tfile, \$xml->toString);
+}
+
+### level_vote () ##############################################################
+#
+# Set 1st or 2nd level voting (only in thread file)
+#
+# Params: $forum  Path and filename of forum
+#         $tpath  Path to thread files
+#         \%info  Hash reference: 'thread', 'posting', 'level', 'value'
+# Return: Status code (Bool)
+#
+# Todo:
+#  * Lock files before modification
+#
+sub level_vote
+{
+    my ($forum, $tpath, $info´) = @_;
+    my ($tid, $mid, $level, $value) = ($info->{'thread'},
+                                       $info->{'posting'},
+                                       $info->{'level'},
+                                       $info->{'value'});
+
+    # Thread
+    my $tfile = $tpath . '/t' . $tid . '.xml';
+
+    my $parser = new XML::DOM::Parser;
+    my $xml = $parser->parsefile($tfile);
+
+    my $mnode = get_message_node($xml, $tid, $mid);
+
+    if ($value == undef)
+    {
+        removeAttribute($level);
+    }
+    else
+    {
+        $mnode->setAttribute($level, $value);
+    }
+
+    return save_file($tfile, \$xml->toString);
+}
+

 ### hide_posting () ############################################################
 #
 # Hide a posting: set 'invisible' flag
 ### hide_posting () ############################################################
 #
 # Hide a posting: set 'invisible' flag


@@ -32,7 +110,8 @@ use XML::DOM;
 # Return: -none-
 #
 # Todo:
 # Return: -none-
 #
 # Todo:

-#  * set flags recursive in forum xml
+#  * set flags recursively in forum xml
+#  * lock files before modification

 #
 sub hide_posting($$$)
 {
 #
 sub hide_posting($$$)
 {


@@ -46,9 +125,7 @@ sub hide_posting($$$)
     change_posting_visibility($tfile, 't'.$tid, 'm'.$mid, 1);
 
     # Forum
     change_posting_visibility($tfile, 't'.$tid, 'm'.$mid, 1);
 
     # Forum

-    #change_posting_visibility($forum, 't'.$tid, 'm'.$mid, 1);    # OBSOLETE
-
-    my ($f, $lthread, $lmsg, $dtd, $zlev) = get_all_threads($forum, 1, 0);
+    my ($f, $lthread, $lmsg, $dtd, $zlev) = get_all_threads($forum, 0, 0);  # filter deleted, descending

 
     for (@{$f->{$tid}})
     {
 
     for (@{$f->{$tid}})
     {


@@ -78,6 +155,7 @@ sub hide_posting($$$)
 #
 # Todo:
 #  * set flags recursive in forum xml
 #
 # Todo:
 #  * set flags recursive in forum xml

+#  * lock files before modification

 #
 sub recover_posting($$$)
 {
 #
 sub recover_posting($$$)
 {


@@ -91,9 +169,7 @@ sub recover_posting($$$)
     change_posting_visibility($tfile, 't'.$tid, 'm'.$mid, 0);
 
     # Forum
     change_posting_visibility($tfile, 't'.$tid, 'm'.$mid, 0);
 
     # Forum

-    #change_posting_visibility($forum, 't'.$tid, 'm'.$mid, 0);    # OBSOLETE
-
-    my ($f, $lthread, $lmsg, $dtd, $zlev) = get_all_threads($forum, 1, 0);
+    my ($f, $lthread, $lmsg, $dtd, $zlev) = get_all_threads($forum, 1, 0);  # do not filter deleted, descending

 
     for (@{$f->{$tid}})
     {
 
     for (@{$f->{$tid}})
     {


@@ -173,26 +249,26 @@ sub modify_posting($$$)
     $body && change_posting_body($tfile, 't'.$tid, 'm'.$mid, $body);
 
     # Forum (does not contain msg bodies)
     $body && change_posting_body($tfile, 't'.$tid, 'm'.$mid, $body);
 
     # Forum (does not contain msg bodies)

-    #change_posting_value($forum, 't'.$tid, 'm'.$mid, \$msgdata);
-
-    my ($f, $lthread, $lmsg, $dtd, $zlev) = get_all_threads($forum, 1, 0);
-
-    for (@{$f->{$tid}})
+    if ($subject or $category)

     {
     {

-        if ($_->{'mid'} == $mid)
+        my ($f, $lthread, $lmsg, $dtd, $zlev) = get_all_threads($forum, 1, 0);
+
+        for (@{$f->{$tid}})

         {
         {

-            $subject && $_->{'subject'} = $subject;
-            $category && $_->{'cat'} = $category;
+            if ($_->{'mid'} == $mid)
+            {
+                $subject && $_->{'subject'} = $subject;
+                $category && $_->{'cat'} = $category;
+            }

         }
         }

-    }

 
 

-    my %cfxs = (
-        'dtd'         => $dtd,
-        'lastMessage' => $lmsg,
-        'lastThread'  => $lthread
-    );
-    my $xmlstring = create_forum_xml_string($f, \%cfxs);
-    save_file($forum, $$xmlstring);
+        my %cfxs = (
+            'dtd'         => $dtd,
+            'lastMessage' => $lmsg,
+            'lastThread'  => $lthread
+        );
+        my $xmlstring = create_forum_xml_string($f, \%cfxs);
+        save_file($forum, $$xmlstring);

 }
 
 ### change_posting_value () ####################################################
 }
 
 ### change_posting_value () ####################################################


@@ -235,6 +311,9 @@ sub change_posting_value($$$$)
 #         $body   New body
 # Return: Status code
 #
 #         $body   New body
 # Return: Status code
 #

+# Todo:
+#  * Change body
+#

 sub change_posting_body($$$$)
 {
     my ($fname, $tid, $mid, $body) = @_;
 sub change_posting_body($$$$)
 {
     my ($fname, $tid, $mid, $body) = @_;

diff --git a/selfforum-cgi/shared/Posting/_lib.pm b/selfforum-cgi/shared/Posting/_lib.pm
index 9ede10553eb9fad8e11ed9e8f4dd5c18ab181f8e..05a0285c2a2cef36a1590a88086f519d09341a99 100644 (file)
--- a/selfforum-cgi/shared/Posting/_lib.pm
+++ b/selfforum-cgi/shared/Posting/_lib.pm
@@ -5,7 +5,7 @@ package Posting::_lib;
 # File:        shared/Posting/_lib.pm                                          #
 #                                                                              #
 # Authors:     André Malo <nd@o3media.de>, 2001-03-03                          #
 # File:        shared/Posting/_lib.pm                                          #
 #                                                                              #
 # Authors:     André Malo <nd@o3media.de>, 2001-03-03                          #

-#              Frank Schoenmann <fs@tower.de>, 2001-03-02                      #
+#              Frank Schoenmann <fs@tower.de>, 2001-03-13                      #

 #                                                                              #
 # Description: Message access interface, time format routines                  #
 #                                                                              #
 #                                                                              #
 # Description: Message access interface, time format routines                  #
 #                                                                              #


@@ -273,7 +273,7 @@ sub sort_thread ($$) {
   \@smsg;
 }
 
   \@smsg;
 }
 

-### delete_messages () ##########################################################
+### delete_messages () #########################################################

 #
 # Filter out deleted messages
 #
 #
 # Filter out deleted messages
 #


@@ -318,7 +318,7 @@ sub delete_messages ($)
   return;
 }
 
   return;
 }
 

-### get_all_threads () ##########################################################
+### get_all_threads () #########################################################

 #
 # Read and Parse the main file (without any XML-module, they are too slow)
 #
 #
 # Read and Parse the main file (without any XML-module, they are too slow)
 #


@@ -440,9 +440,9 @@ sub get_all_threads ($$;$)
     $threads{$tid} = $smsg if (@$smsg);
   }
 
     $threads{$tid} = $smsg if (@$smsg);
   }
 

-  wantarray ?
-    (\%threads, $last_thread, $last_message, $dtd, \@unids)
-  : \%threads;
+  wantarray
+    ? (\%threads, $last_thread, $last_message, $dtd, \@unids)
+    : \%threads;

 }
 
 ###########################
 }
 
 ###########################


@@ -572,4 +572,4 @@ sub long_hr_time ($) {
 # ====================================================
 
 # making require happy
 # ====================================================
 
 # making require happy

-1;
\ No newline at end of file
+1;