Changeset 698
Legend:
- Unmodified
- Added
- Removed
-
trunk/Build.PL
r665 r698 46 46 until ( $dbtype ) { 47 47 my $def = $existing_config->dbtype; 48 $dbtype = Module::Build->prompt("\n$dbtype_qu", $def);49 $dbtype = lc($dbtype);50 $dbtype =~ s/^\s*//;51 $dbtype =~ s/\s*$//;52 unless ( $dbtype eq "postgres" or $dbtype eq "mysql"48 $dbtype = Module::Build->prompt("\n$dbtype_qu", $def); 49 $dbtype = lc($dbtype); 50 $dbtype =~ s/^\s*//; 51 $dbtype =~ s/\s*$//; 52 unless ( $dbtype eq "postgres" or $dbtype eq "mysql" 53 53 or $dbtype eq "sqlite" ) { 54 undef $dbtype;55 }54 undef $dbtype; 55 } 56 56 } 57 57 } … … 95 95 print "$var not relevant for SQLite... skipping...\n"; 96 96 push @answers, { question => $qu, 97 variable => $var,98 value => "not-used" };97 variable => $var, 98 value => "not-used" }; 99 99 next; 100 100 } … … 121 121 } 122 122 $val = Module::Build->y_n("\n$qu ", $def); 123 } else {123 } else { 124 124 $val = Module::Build->prompt("\n$qu ", $def); 125 }125 } 126 126 } 127 127 … … 139 139 140 140 push @answers, { question => $qu, 141 variable => $var,142 value => $val };141 variable => $var, 142 value => $val }; 143 143 } 144 144 … … 158 158 until ( $choice ) { 159 159 my $def = $existing_config->geo_handler; 160 $choice = Module::Build->prompt("\n".$geo_handler_qu, $def);161 $choice =~ s/^\s*//;162 $choice =~ s/\s*$//;163 unless ( $choice eq "1" or $choice eq "2" or $choice eq "3" ) {160 $choice = Module::Build->prompt("\n".$geo_handler_qu, $def); 161 $choice =~ s/^\s*//; 162 $choice =~ s/\s*$//; 163 unless ( $choice eq "1" or $choice eq "2" or $choice eq "3" ) { 164 164 undef $choice; 165 }165 } 166 166 } 167 167 $geo_handler = $choice; … … 183 183 my $def = $existing_config->ellipsoid; 184 184 $ellipsoid = Module::Build->prompt("\n".$qu, $def); 185 $ellipsoid =~ s/^\s*//;186 $ellipsoid =~ s/\s*$//;185 $ellipsoid =~ s/^\s*//; 186 $ellipsoid =~ s/\s*$//; 187 187 } 188 188 push @answers, { … … 215 215 requires => { 216 216 'Algorithm::Diff' => '0.13', # for sdiff 217 'CGI' => '2.92', # avoid escapeHTML bug218 'CGI::Carp' => 0,219 'CGI::Cookie' => 0,220 'CGI::Wiki' => '0.62', # fixed delete version221 'CGI::Wiki::Formatter::UseMod' => '0.16', # macros217 'CGI' => '2.92', # avoid escapeHTML bug 218 'CGI::Carp' => 0, 219 'CGI::Cookie' => 0, 220 'CGI::Wiki' => '0.62', # fixed delete version 221 'CGI::Wiki::Formatter::UseMod' => '0.16', # macros 222 222 'CGI::Wiki::Plugin::Categoriser' => 0, 223 'CGI::Wiki::Plugin::Diff' => '0.07', # earlier buggy224 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3225 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.072', # provides RSS timestamp 223 'CGI::Wiki::Plugin::Diff' => '0.07', # earlier buggy 224 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 225 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.073', # earlier doesn't escape XML properly 226 226 'CGI::Wiki::Plugin::RSS::Reader' => '1.3', # earlier versions don't support RSS 2.0 227 227 'Class::Accessor' => 0, 228 'Config::Tiny' => 0,229 'Data::Dumper' => 0,228 'Config::Tiny' => 0, 229 'Data::Dumper' => 0, 230 230 $drivers{$dbtype} => 0, 231 'File::Spec::Functions' => 0,231 'File::Spec::Functions' => 0, 232 232 'File::Temp' => 0, 233 'Geography::NationalGrid' => 0,233 'Geography::NationalGrid' => 0, 234 234 'LWP::Simple' => 0, 235 'Parse::RecDescent' => 0,236 $search_module => 0,237 'Template' => 0,235 'Parse::RecDescent' => 0, 236 $search_module => 0, 237 'Template' => 0, 238 238 'Test::MockObject' => '0.07', # earlier doesn't use 'mock' 239 'Time::Piece' => 0,240 'URI::Escape' => 0,239 'Time::Piece' => 0, 240 'URI::Escape' => 0, 241 241 'XML::RSS' => 0, 242 },242 }, 243 243 build_requires => { 244 244 'Module::Build' => '0.18', # earlier doesn't install script files … … 260 260 "newpage.cgi" ]; 261 261 $build->{config}{__templates} = [ 262 "backlink_results.tt",263 "banner.tt",262 "backlink_results.tt", 263 "banner.tt", 264 264 "delete_confirm.tt", 265 265 "delete_done.tt", 266 266 "delete_password_wrong.tt", 267 267 "differences.tt", 268 "display_metadata.tt",268 "display_metadata.tt", 269 269 "edit_conflict.tt", 270 270 "edit_form.tt", … … 278 278 "node_history.tt", 279 279 "openguides_information_boxes.tt", 280 "preferences.tt",280 "preferences.tt", 281 281 "rdf_index.tt", 282 282 "recent_changes.tt", -
trunk/Changes
r697 r698 7 7 Update URL for Dublin Core elements in RDF index view. 8 8 Locales, address and summary fields now XML-escaped properly. 9 Requirement on CGI::Wiki::Plugin::RSS::ModWiki bumped to 0.073 for 10 associated fix escaping node names in RSS feed. 9 11 Fix bug that was breaking coordinate entry fields on search page if lat/lon 10 12 was being used. -
trunk/PREREQUISITES
r674 r698 11 11 CGI::Wiki::Plugin::Diff (version 0.07 or later) 12 12 CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later) 13 CGI::Wiki::Plugin::RSS::ModWiki (version 0.07 2or later)13 CGI::Wiki::Plugin::RSS::ModWiki (version 0.073 or later) 14 14 CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later) 15 15 Class::Accessor
