fix race condition in lftp mirroring

[booh] / bin / webalbum2booh

diff --git a/bin/webalbum2booh b/bin/webalbum2booh
old mode 100755 (executable)
new mode 100644 (file)
index e673d5e..61daaec
--- a/bin/webalbum2booh
+++ b/bin/webalbum2booh
@@ -1,8 +1,8 @@
-#!/usr/bin/ruby
+#! /usr/bin/ruby
 #
 #                         *  BOOH  *
 #
-# A.k.a `Best web-album Of the world, Or your money back, Humerus'.
+# A.k.a 'Best web-album Of the world, Or your money back, Humerus'.
 #
 # The acronyn sucks, however this is a tribute to Dragon Ball by
 # Akira Toriyama, where the last enemy beaten by heroes of Dragon
@@ -10,19 +10,19 @@
 # called Boo, so this one will be it "Booh". Or whatever.
 #
 #
-# Copyright (c) 2004 Guillaume Cottenceau <gc3 at bluewin.ch>
+# Copyright (c) 2004-2006 Guillaume Cottenceau <http://zarb.org/~gc/resource/gc_mail.png>
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license version 2.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 require 'getoptlong'
 require 'gettext'
 include GetText
-require 'rexml/document'
+require 'booh/rexml/document'
 include REXML
 
 require 'booh/booh-lib'
@@ -63,7 +63,7 @@ def handle_options
                     $xmldoc = REXML::Document.new File.new(arg)
                     $conffile = arg
                 else
-                    die _('Config file does not exist or is unreadable.')
+                    die_ _('Config file does not exist or is unreadable.')
                 end
 
             when '--verbose-level'
@@ -78,7 +78,7 @@ def handle_options
     end
 
     if !$xmldoc
-        die _("Missing --config parameter.")
+        die_ _("Missing --config parameter.")
     end
 
     $source = $xmldoc.root.attributes['source']
@@ -88,9 +88,11 @@ end
 def utf8_and_entities(string)
     return utf8(string).gsub('&agrave;', 'à').
                         gsub('&ccedil;', 'ç').
+                        gsub('&ocirc;',  'ô').
                         gsub('&eacute;', 'é').
                         gsub('&ecirc;',  'ê').
                         gsub('&egrave;', 'è').
+                        gsub('&Egrave;', 'È').
                         gsub('&icirc;',  'î').
                         gsub('&lt;',     '<').
                         gsub('&gt;',     '>').
@@ -157,5 +159,5 @@ handle_options
 walk_source_dir
 
 ios = File.open("#{$conffile}.merged", "w")
-$xmldoc.write(ios, 0)
+$xmldoc.write(ios)
 ios.close