improved the behavior of get_all_threads and create_forum_xml_string

[selfforum.git] / selfforum-cgi / shared / Posting / Write.pm

diff --git a/selfforum-cgi/shared/Posting/Write.pm b/selfforum-cgi/shared/Posting/Write.pm
index 507cd81337b121778ea8bf018cb101122e921795..62fa11cb75aef9857a02719e061ee175a6445f94 100644 (file)
--- a/selfforum-cgi/shared/Posting/Write.pm
+++ b/selfforum-cgi/shared/Posting/Write.pm
@@ -4,21 +4,21 @@ package Posting::Write;
 #                                                                              #
 # File:        shared/Posting/Write.pm                                         #
 #                                                                              #
 #                                                                              #
 # File:        shared/Posting/Write.pm                                         #
 #                                                                              #

-# Authors:     André Malo <nd@o3media.de>, 2001-04-08                          #
+# Authors:     André Malo <nd@o3media.de>                                      #

 #                                                                              #
 # Description: Save a posting                                                  #
 #                                                                              #
 ################################################################################
 
 use strict;
 #                                                                              #
 # Description: Save a posting                                                  #
 #                                                                              #
 ################################################################################
 
 use strict;

-use vars qw(%error @EXPORT);
+use vars qw(
+  %error
+  @EXPORT
+);

 
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Encode::Posting;
 
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Encode::Posting;

-use Lock qw(
-  :WRITE
-  release_file
-);
+use Lock;

 use Posting::_lib qw(
   get_message_node
   get_message_header
 use Posting::_lib qw(
   get_message_node
   get_message_header


@@ -39,6 +39,16 @@ use XML::DOM;
   noParent    => '4 could not find parent message'
 );
 
   noParent    => '4 could not find parent message'
 );
 

+################################################################################
+#
+# Version check
+#
+# last modified:
+#    $Date$ (GMT)
+# by $Author$
+#
+sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'}
+

 ################################################################################
 #
 # Export
 ################################################################################
 #
 # Export


@@ -116,8 +126,8 @@ sub write_new_thread ($) {
   );
 
   save_file ($param -> {forumFile}, $forum) or return $error{forumWrite};
   );
 
   save_file ($param -> {forumFile}, $forum) or return $error{forumWrite};

-  release_file ($param -> {messagePath}.$tid.'.xml');
-  return (0, $thread, $mid);
+  new Lock ($param -> {messagePath}.$tid.'.xml') -> release;
+  return (0, $thread, $mid, $tid);

 }
 
 ### sub write_reply_posting ($) ################################################
 }
 
 ### sub write_reply_posting ($) ################################################


@@ -135,25 +145,24 @@ sub write_reply_posting ($) {
   my $mid   = 'm'.($param -> {lastMessage} + 1);
   my $tid   = 't'.($param -> {thread});
 
   my $mid   = 'm'.($param -> {lastMessage} + 1);
   my $tid   = 't'.($param -> {thread});
 

-  my $tfile = $param -> {messagePath}.$tid.'.xml';
+  my $tfile = new Lock ($param -> {messagePath}.$tid.'.xml');

 
 

-  unless (write_lock_file ($tfile)) {
-    violent_unlock_file ($tfile);
+  unless ($tfile->lock(LH_EXCL)) {

     return $error{threadFile};
   }
 
   else {
     return $error{threadFile};
   }
 
   else {

-    my $xml = parse_xml_file ($tfile);
+    my $xml = parse_xml_file ($tfile->filename);

 
     unless ($xml) {
 
     unless ($xml) {

-      violent_unlock_file ($tfile) unless (write_unlock_file ($tfile));
+      $tfile -> unlock;

       return $error{threadFile};
     }
 
     my $mnode = get_message_node ($xml, $tid, 'm'.$param -> {parentMessage});
 
     unless (defined $mnode) {
       return $error{threadFile};
     }
 
     my $mnode = get_message_node ($xml, $tid, 'm'.$param -> {parentMessage});
 
     unless (defined $mnode) {

-      violent_unlock_file ($tfile) unless (write_unlock_file ($tfile));
+      $tfile -> unlock;

       return $error{noParent};
     }
 
       return $error{noParent};
     }
 


@@ -192,12 +201,12 @@ sub write_reply_posting ($) {
 
     # save thread file
     #
 
     # save thread file
     #

-    unless (save_file ($tfile, \($xml -> toString))) {
-      violent_unlock_file ($tfile) unless (write_unlock_file ($tfile));
+    unless (save_file ($tfile->filename, \($xml -> toString))) {
+      $tfile -> unlock;

       return $error{threadWrite};
     }
 
       return $error{threadWrite};
     }
 

-    violent_unlock_file ($tfile) unless (write_unlock_file ($tfile));
+    $tfile -> unlock;

 
     $thread = $xml;
 
 
     $thread = $xml;
 


@@ -228,14 +237,14 @@ sub write_reply_posting ($) {
       $param -> {parsedThreads},
       { dtd         => $param -> {dtd},
         lastMessage => $mid,
       $param -> {parsedThreads},
       { dtd         => $param -> {dtd},
         lastMessage => $mid,

-        lastThread  => $tid
+        lastThread  => 't'.$param -> {lastThread}

       }
     );
 
     save_file ($param -> {forumFile}, $forum) or return $error{forumWrite};
   }
 
       }
     );
 
     save_file ($param -> {forumFile}, $forum) or return $error{forumWrite};
   }
 

-  return (0, $thread, $mid);
+  return (0, $thread, $mid, $tid);

 }
 
 # keep 'require' happy
 }
 
 # keep 'require' happy