changeset 207:86bf1a0cd9e1

Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 21 Jul 2014 16:01:34 +0300
parents f56c598be862 (current diff) 2ac661d551b3 (diff)
children c6bbf69afc57
files
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/fetch_weather.pl	Wed Jun 18 21:03:58 2014 +0300
+++ b/fetch_weather.pl	Mon Jul 21 16:01:34 2014 +0300
@@ -3,20 +3,22 @@
 #
 # Fetch Weather v0.1 by Matti 'ccr' Hamalainen <ccr@tnsp.org>
 # (C) Copyright 2014 Tecnic Software productions (TNSP)
+# This script is freely distributable under GNU GPL (version 2) license.
 #
 # Should be ran as a cronjob, and configured properly.
-# 15 * * * *     /absolute/path/to/fetch_weather.pl </path/to/configfile>
+# */10 * * * *     perl -w /absolute/path/to/fetch_weather.pl /path/to/configfile
 #
 # Configuration file example is in fetch_weather.config
 #
-# This script is freely distributable under GNU GPL (version 2) license.
+# Requires various Perl modules, in Debian the packages should be:
+# libwww-perl libxml-simple-perl libtimedate-perl
+#
 #
 ##########################################################################
 use strict;
 use LWP::UserAgent;
 use HTML::Entities;
 use XML::Simple;
-use Text::Iconv;
 use Date::Format;
 use Date::Parse;
 use Data::Dumper;
--- a/urllog.tcl	Wed Jun 18 21:03:58 2014 +0300
+++ b/urllog.tcl	Mon Jul 21 16:01:34 2014 +0300
@@ -489,7 +489,7 @@
   }
 
   ### Does the document pointed by the URL exist?
-  if {[catch {set utoken [::http::geturl $urlStr -progress urllog_http_handler -blocksize 1024 -timeout 3000]} uerrmsg]} {
+  if {[catch {set utoken [::http::geturl $urlStr -progress urllog_http_handler -blocksize 2048 -timeout 6000]} uerrmsg]} {
     urllog_verb_msg $urlNick $urlChan "$urlmsg_ioerror ($uerrmsg)"
     urllog_log "HTTP request failed: $uerrmsg"
     return 0