From e83be49433fc47ea7058129cf02f4fc23fb38b4e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 13 Dec 2002 06:50:30 +0000 Subject: Handle indexfilebasename and thesaurusindexfile with extension gracefully for now --- Echolot/Config.pm | 15 ++++++++++++++- NEWS | 1 - 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Echolot/Config.pm b/Echolot/Config.pm index a2cc755..fc0d9ae 100644 --- a/Echolot/Config.pm +++ b/Echolot/Config.pm @@ -1,7 +1,7 @@ package Echolot::Config; # (c) 2002 Peter Palfrader -# $Id: Config.pm,v 1.43 2002/12/03 02:59:13 weasel Exp $ +# $Id: Config.pm,v 1.44 2002/12/13 06:50:30 weasel Exp $ # =pod @@ -217,6 +217,7 @@ sub init($) { for my $key (keys %$CONFIG) { warn("Unkown option: $key\n") unless (exists $DEFAULT->{$key}); }; + # Work around spelling bug until 2.0rc3 if (exists $CONFIG->{'seperate_rlists'}) { if (exists $CONFIG->{'separate_rlists'}) { @@ -228,6 +229,18 @@ sub init($) { delete $CONFIG->{'seperate_rlists'}; } + # In 2.0.6: thesaurusindexfile and indexfilebasename config values + # should not longer have the extension (.html) in them + # Handle this gracefully for now: + if (exists $CONFIG->{'thesaurusindexfile'}) { + $CONFIG->{'thesaurusindexfile'} =~ s/\.html?$// and + warn ("thesaurusindexfile no longer should have the .html extension.\n"); + } + if (exists $CONFIG->{'indexfilebasename'}) { + $CONFIG->{'indexfilebasename'} =~ s/\.html?$// and + warn ("indexfilebasename no longer should have the .html extension.\n"); + } + for my $key (keys %$DEFAULT) { $CONFIG->{$key} = $DEFAULT->{$key} unless exists $CONFIG->{$key}; }; diff --git a/NEWS b/NEWS index 61b87e8..4af2847 100644 --- a/NEWS +++ b/NEWS @@ -4,7 +4,6 @@ Changes in * Minor documentation fixes by Colin Tuckley * thesaurusindexfile and indexfilebasename config values should no longer have the extension (.html) in them - FIXME - handle this gracefully for now Changes in version 2.0.5 - 2002-10-25 * Only take default parameters if they are not set in -- cgit v1.2.3