diff options
27 files changed, 2765 insertions, 588 deletions
diff --git a/bin/send-reports b/bin/send-reports index 35f5bdd84..9a70c215b 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -163,7 +163,7 @@ while (my $row = $unsent->next) { # look in the DB to determine if there is a special handler for this council (e.g., open311, or custom) my $council_config = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $council} )->first; - $send_method = $council_config->send_method if $council_config; + $send_method = $council_config->send_method if ($council_config and $council_config->send_method); if ($council == COUNCIL_ID_EAST_HANTS) { # E. Hants have a web service $send_method = SEND_METHOD_EAST_HANTS; # TODO: delete? should be in the db $h{category} = 'Customer Services' if $h{category} eq 'Other'; @@ -247,7 +247,7 @@ while (my $row = $unsent->next) { } - unless ($send_method) { + unless ($send_email || $send_method) { die 'Report not going anywhere for ID ' . $row->id . '!'; } @@ -379,8 +379,7 @@ if ($verbose) { } } -# not conditional on verbose because these can be considered failures (more relevant than one-off error messages?) -if (keys %sending_skipped_by_method) { +if ($verbose and keys %sending_skipped_by_method) { my $c = 0; print "\nProblem reports that send-reports did not attempt to send because retries >= " . SEND_FAIL_RETRIES_CUTOFF . ":\n"; foreach my $send_method (sort keys %sending_skipped_by_method) { @@ -550,6 +549,7 @@ sub post_barnet_message { if (my $barnet_id = $result->get_EV_ORDER_NO()) { $problem->external_id( $barnet_id ); $problem->external_body( 'Barnet Borough Council' ); # better to use $problem->body()? + $problem->send_method_used('barnet'); $return = 0; } else { $err_msg = "Failed (problem id $h{id}): service returned no external id"; @@ -750,4 +750,4 @@ sub update_send_fail_data { send_fail_timestamp => \'ms_current_timestamp()', send_fail_reason => $err_msg } ); -}
\ No newline at end of file +} diff --git a/carton.lock b/carton.lock index 1f73bfad4..cd7b0e70b 100644 --- a/carton.lock +++ b/carton.lock @@ -3336,6 +3336,114 @@ }, "version" : "1.4" }, + "Class::Std" : { + "dist" : "Class-Std-0.011", + "module" : "Class::Std", + "mymeta" : { + "abstract" : "Support for creating standard \"inside-out\" classes", + "author" : [ + "Damian Conway <DCONWAY@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Class-Std", + "prereqs" : { + "runtime" : { + "requires" : { + "Data::Dumper" : 0, + "Scalar::Util" : 0, + "Test::More" : 0 + } + } + }, + "release_status" : "stable", + "version" : "0.011" + }, + "name" : "Class::Std", + "pathname" : "D/DC/DCONWAY/Class-Std-0.011.tar.gz", + "provides" : { + "Class::Std" : { + "file" : "Class/Std.pm", + "version" : "0.011" + }, + "Class::Std::SCR" : { + "file" : "Class/Std.pm" + } + }, + "version" : "0.011" + }, + "Class::Std::Fast" : { + "dist" : "Class-Std-Fast-v0.0.8", + "module" : "Class::Std::Fast::Storable", + "mymeta" : { + "abstract" : "faster but less secure than Class::Std", + "author" : [ + "Andreas 'ac0v' Specht - ACID@cpan.org" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Class-Std-Fast", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : 0 + } + }, + "runtime" : { + "requires" : { + "Class::Std" : "v0.0.8", + "Data::Dumper" : 0, + "Scalar::Util" : 0, + "version" : 0 + } + } + }, + "provides" : { + "Class::Std::Fast" : { + "file" : "lib/Class/Std/Fast.pm", + "version" : "v0.0.8" + }, + "Class::Std::Fast::Storable" : { + "file" : "lib/Class/Std/Fast/Storable.pm", + "version" : "v0.0.8" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "v0.0.8" + }, + "name" : "Class::Std::Fast", + "pathname" : "A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz", + "provides" : { + "Class::Std::Fast" : { + "file" : "Class/Std/Fast.pm", + "version" : "v0.0.8" + }, + "Class::Std::Fast::Storable" : { + "file" : "Class/Std/Fast/Storable.pm", + "version" : "v0.0.8" + } + }, + "version" : "v0.0.8" + }, "Class::Unload" : { "dist" : "Class-Unload-0.07", "module" : "Class::Unload", @@ -5015,6 +5123,311 @@ }, "version" : "0.00011" }, + "DBIx::Class::IntrospectableM2M" : { + "dist" : "DBIx-Class-IntrospectableM2M-0.001001", + "module" : "DBIx::Class::IntrospectableM2M", + "mymeta" : { + "abstract" : "Introspect many-to-many relationships", + "author" : [ + "Guillermo Roditi (groditi) <groditi@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 0.76, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "DBIx-Class-IntrospectableM2M", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "DBIx::Class" : 0, + "ExtUtils::MakeMaker" : "6.62", + "Test::More" : 0 + } + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "0.001001" + }, + "name" : "DBIx::Class::IntrospectableM2M", + "pathname" : "G/GR/GRODITI/DBIx-Class-IntrospectableM2M-0.001001.tar.gz", + "provides" : { + "DBIx::Class::IntrospectableM2M" : { + "file" : "DBIx/Class/IntrospectableM2M.pm", + "version" : "0.001001" + } + }, + "version" : "0.001001" + }, + "DBIx::Class::Schema::Loader" : { + "dist" : "DBIx-Class-Schema-Loader-0.07017", + "module" : "DBIx::Class::Schema::Loader", + "mymeta" : { + "abstract" : "Create a DBIx::Class::Schema based on a database", + "author" : [ + "blblack: Brandon Black <blblack@gmail.com>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "DBIx-Class-Schema-Loader", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "DBD::SQLite" : "1.29", + "DBI" : "1.56", + "DBIx::Class::IntrospectableM2M" : 0, + "ExtUtils::MakeMaker" : "6.62", + "File::Copy" : 0, + "File::Path" : "2.07", + "File::Temp" : "0.16", + "IPC::Open3" : 0, + "Test::Exception" : 0, + "Test::More" : "0.94", + "Test::Warn" : "0.21" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62" + } + }, + "runtime" : { + "requires" : { + "Carp::Clan" : 0, + "Class::Accessor::Grouped" : "0.10002", + "Class::C3::Componentised" : "1.0008", + "Class::Inspector" : 0, + "Class::Unload" : 0, + "DBD::SQLite" : "1.29", + "DBI" : "1.56", + "DBIx::Class" : "0.08127", + "DBIx::Class::IntrospectableM2M" : 0, + "Data::Dump" : "1.06", + "Digest::MD5" : "2.36", + "Exporter" : "5.63", + "File::Copy" : 0, + "File::Path" : "2.07", + "File::Spec" : 0, + "File::Temp" : "0.16", + "IPC::Open3" : 0, + "Lingua::EN::Inflect::Number" : "1.1", + "Lingua::EN::Inflect::Phrase" : "0.02", + "Lingua::EN::Tagger" : 0, + "List::MoreUtils" : 0, + "MRO::Compat" : "0.09", + "Scalar::Util" : 0, + "Scope::Guard" : 0, + "String::CamelCase" : "0.02", + "String::ToIdentifier::EN" : "0.05", + "Sub::Name" : 0, + "Task::Weaken" : 0, + "Test::Exception" : 0, + "Test::More" : "0.94", + "Test::Warn" : "0.21", + "Try::Tiny" : 0, + "namespace::clean" : "0.20", + "perl" : "5.008001" + } + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://git.shadowcat.co.uk/dbsrgits/DBIx-Class-Schema-Loader.git" + }, + "x_IRC" : "irc://irc.perl.org/#dbix-class", + "x_MailingList" : "http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class" + }, + "version" : "0.07017" + }, + "name" : "DBIx::Class::Schema::Loader", + "pathname" : "R/RK/RKITOVER/DBIx-Class-Schema-Loader-0.07017.tar.gz", + "provides" : { + "DBIx::Class::Schema::Loader" : { + "file" : "DBIx/Class/Schema/Loader.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::Base" : { + "file" : "DBIx/Class/Schema/Loader/Base.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI" : { + "file" : "DBIx/Class/Schema/Loader/DBI.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ADO" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ADO.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ADO::MS_Jet" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ADO::Microsoft_SQL_Server" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::DB2" : { + "file" : "DBIx/Class/Schema/Loader/DBI/DB2.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Firebird" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Firebird.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Informix" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Informix.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::InterBase" : { + "file" : "DBIx/Class/Schema/Loader/DBI/InterBase.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::MSSQL" : { + "file" : "DBIx/Class/Schema/Loader/DBI/MSSQL.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::ACCESS" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::Firebird" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::Microsoft_SQL_Server" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::SQL_Anywhere" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Oracle" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Oracle.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Pg" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Pg.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::SQLAnywhere" : { + "file" : "DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::SQLite" : { + "file" : "DBIx/Class/Schema/Loader/DBI/SQLite.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Sybase" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Sybase.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Sybase::Common" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Sybase::Microsoft_SQL_Server" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Writing" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Writing.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::mysql" : { + "file" : "DBIx/Class/Schema/Loader/DBI/mysql.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBObject" : { + "file" : "DBIx/Class/Schema/Loader/DBObject.pm" + }, + "DBIx::Class::Schema::Loader::DBObject::Informix" : { + "file" : "DBIx/Class/Schema/Loader/DBObject/Informix.pm" + }, + "DBIx::Class::Schema::Loader::DBObject::Sybase" : { + "file" : "DBIx/Class/Schema/Loader/DBObject/Sybase.pm" + }, + "DBIx::Class::Schema::Loader::Optional::Dependencies" : { + "file" : "DBIx/Class/Schema/Loader/Optional/Dependencies.pm" + }, + "DBIx::Class::Schema::Loader::RelBuilder" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_040" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_06" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_07" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_07.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::Table" : { + "file" : "DBIx/Class/Schema/Loader/Table.pm" + }, + "DBIx::Class::Schema::Loader::Table::Informix" : { + "file" : "DBIx/Class/Schema/Loader/Table/Informix.pm" + }, + "DBIx::Class::Schema::Loader::Table::Sybase" : { + "file" : "DBIx/Class/Schema/Loader/Table/Sybase.pm" + } + }, + "version" : "0.07017" + }, "Data::Compare" : { "dist" : "Data-Compare-1.22", "module" : "Data::Compare", @@ -15849,24 +16262,63 @@ }, "version" : "6.01" }, - "List::MoreUtils" : { - "dist" : "List-MoreUtils-0.33", - "module" : "List::MoreUtils", + "Lingua::EN::Inflect" : { + "dist" : "Lingua-EN-Inflect-1.893", + "module" : "Lingua::EN::Inflect", "mymeta" : { - "abstract" : "Provide the stuff missing in List::Util", + "abstract" : "Convert singular to plural. Select \"a\" or \"an\".", "author" : [ - "Tassilo von Parseval <tassilo.von.parseval@rwth-aachen.de>" + "Damian Conway <DCONWAY@CPAN.org>" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", "license" : [ - "perl_5" + "unknown" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "List-MoreUtils", + "name" : "Lingua-EN-Inflect", + "prereqs" : { + "runtime" : { + "requires" : { + "Test::More" : 0, + "version" : 0 + } + } + }, + "release_status" : "stable", + "version" : "1.893" + }, + "name" : "Lingua::EN::Inflect", + "pathname" : "D/DC/DCONWAY/Lingua-EN-Inflect-1.893.tar.gz", + "provides" : { + "Lingua::EN::Inflect" : { + "file" : "Lingua/EN/Inflect.pm", + "version" : "1.893" + } + }, + "version" : "1.893" + }, + "Lingua::EN::Inflect::Number" : { + "dist" : "Lingua-EN-Inflect-Number-1.1", + "module" : "Lingua::EN::Inflect::Number", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-EN-Inflect-Number", "no_index" : { "directory" : [ "t", @@ -15876,45 +16328,44 @@ "prereqs" : { "build" : { "requires" : { - "Test::More" : "0.42" + "ExtUtils::MakeMaker" : 0 } }, "configure" : { "requires" : { - "ExtUtils::CBuilder" : "0.27", - "ExtUtils::MakeMaker" : "6.52" + "ExtUtils::MakeMaker" : 0 } }, "runtime" : { "requires" : { - "Test::More" : "0.82", - "perl" : "5.00503" + "Lingua::EN::Inflect" : 0 } } }, "release_status" : "stable", - "version" : "0.33" + "version" : "1.1" }, - "name" : "List::MoreUtils", - "pathname" : "A/AD/ADAMK/List-MoreUtils-0.33.tar.gz", + "name" : "Lingua::EN::Inflect::Number", + "pathname" : "S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz", "provides" : { - "List::MoreUtils" : { - "file" : "List/MoreUtils.pm", - "version" : "0.33" + "Lingua::EN::Inflect::Number" : { + "file" : "Lingua/EN/Inflect/Number.pm", + "version" : "1.1" } }, - "version" : "0.33" + "version" : "1.1" }, - "Locale::Maketext" : { - "dist" : "Locale-Maketext-1.22", - "module" : "Locale::Maketext", + "Lingua::EN::Inflect::Phrase" : { + "dist" : "Lingua-EN-Inflect-Phrase-0.12", + "module" : "Lingua::EN::Inflect::Phrase", "mymeta" : { - "abstract" : "framework for localization", + "abstract" : "Inflect short English Phrases", "author" : [ - "unknown" + "Rafael Kitover <rkitover@cpan.org>", + "Rafael Kitover <rkitover@cpan.org>" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001, CPAN::Meta::Converter version 2.112150", + "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150", "license" : [ "perl_5" ], @@ -15922,204 +16373,669 @@ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "Locale-Maketext", + "name" : "Lingua-EN-Inflect-Phrase", "no_index" : { "directory" : [ - "t", - "inc" + "inc", + "t" ] }, "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "6.36", + "Test::More" : "0.94" } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "6.36" } }, "runtime" : { "requires" : { - "I18N::LangTags" : "0.31", - "I18N::LangTags::Detect" : 0, - "Test::More" : 0 + "Exporter" : "5.63", + "Lingua::EN::Inflect" : "1.891", + "Lingua::EN::Inflect::Number" : "1.1", + "Lingua::EN::Tagger" : "0.15", + "Test::More" : "0.94" } } }, + "provides" : { + "Lingua::EN::Inflect::Phrase" : { + "file" : "lib/Lingua/EN/Inflect/Phrase.pm", + "version" : "0.12" + } + }, "release_status" : "stable", "resources" : { - "bugtracker" : { - "web" : "http://rt.perl.org/perlbug/" - }, "license" : [ "http://dev.perl.org/licenses/" ], "repository" : { - "url" : "http://perl5.git.perl.org/perl.git/tree/HEAD:/dist/Locale-Maketext" - }, - "x_MailingList" : "http://lists.perl.org/list/perl5-porters.html" + "type" : "git", + "url" : "git://github.com/rkitover/lingua-en-inflect-phrase.git" + } }, - "version" : "1.22" + "version" : "0.12" }, - "name" : "Locale::Maketext", - "pathname" : "T/TO/TODDR/Locale-Maketext-1.22.tar.gz", + "name" : "Lingua::EN::Inflect::Phrase", + "pathname" : "R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.12.tar.gz", "provides" : { - "Locale::Maketext" : { - "file" : "Locale/Maketext.pm", - "version" : "1.22" + "Lingua::EN::Inflect::Phrase" : { + "file" : "Lingua/EN/Inflect/Phrase.pm", + "version" : "0.12" + } + }, + "version" : "0.12" + }, + "Lingua::EN::Tagger" : { + "dist" : "Lingua-EN-Tagger-0.16", + "module" : "Lingua::EN::Tagger", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "Maciej Ceglowski and Aaron Coburn <maciej@ceglowski.com>, <aaron@coburncuadrado.com>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" }, - "Locale::Maketext::Guts" : { - "file" : "Locale/Maketext/Guts.pm", - "version" : "1.20" + "name" : "Lingua-EN-Tagger", + "no_index" : { + "directory" : [ + "t", + "inc" + ] }, - "Locale::Maketext::GutsLoader" : { - "file" : "Locale/Maketext/GutsLoader.pm", - "version" : "1.20" + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "File::Spec" : "0.84", + "HTML::Parser" : "3.45", + "Lingua::Stem" : "0.81", + "Memoize" : "1.01", + "Memoize::ExpireLRU" : "0.55", + "Storable" : "2.10" + } + } + }, + "release_status" : "stable", + "version" : "0.16" + }, + "name" : "Lingua::EN::Tagger", + "pathname" : "A/AC/ACOBURN/Lingua-EN-Tagger-0.16.tar.gz", + "provides" : { + "Lingua::EN::Tagger" : { + "file" : "Lingua/EN/Tagger.pm", + "version" : "0.16" } }, - "version" : "1.22" + "version" : "0.16" }, - "Locale::Maketext::Lexicon" : { - "dist" : "Locale-Maketext-Lexicon-0.91", - "module" : "Locale::Maketext::Lexicon", + "Lingua::PT::Stemmer" : { + "dist" : "Lingua-PT-Stemmer-0.01", + "module" : "Lingua::PT::Stemmer", "mymeta" : { - "abstract" : "Use other catalog formats in Maketext", + "abstract" : "Portuguese language stemming", "author" : [ - "Audrey Tang <cpan@audreyt.org>" + "xern <xern@cpan.org>" ], "dynamic_config" : 0, - "generated_by" : "Module::Install version 1.01, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", "license" : [ - "mit" + "unknown" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "Locale-Maketext-Lexicon", + "name" : "Lingua-PT-Stemmer", "no_index" : { "directory" : [ - "inc", - "t" + "t", + "inc" ] }, "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : "6.42", - "Test::More" : 0 + "ExtUtils::MakeMaker" : 0 } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : "6.42" + "ExtUtils::MakeMaker" : 0 } }, "runtime" : { - "recommends" : { - "HTML::Parser" : "3.56", - "Lingua::EN::Sentence" : "0.25", - "PPI" : "1.203", - "Template" : "2.20", - "Template::Constants" : "2.75", - "YAML" : "0.66", - "YAML::Loader" : "0.66" - }, + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.01" + }, + "name" : "Lingua::PT::Stemmer", + "pathname" : "X/XE/XERN/Lingua-PT-Stemmer-0.01.tar.gz", + "provides" : { + "Lingua::GL::Stemmer" : { + "file" : "Lingua/GL/Stemmer.pm", + "version" : "0.01" + }, + "Lingua::PT::Stemmer" : { + "file" : "Lingua/PT/Stemmer.pm", + "version" : "0.01" + } + }, + "version" : "0.01" + }, + "Lingua::Stem" : { + "dist" : "Lingua-Stem-0.84", + "module" : "Lingua::Stem", + "mymeta" : { + "abstract" : "Stemming of words in various languages", + "author" : [ + "Benjamin Franz <snowhare@nihongo.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-Stem", + "prereqs" : { + "runtime" : { "requires" : { - "Locale::Maketext" : "1.17", - "perl" : "5.005" + "Carp" : 0, + "Lingua::GL::Stemmer" : 0, + "Lingua::PT::Stemmer" : 0, + "Lingua::Stem::Fr" : "0.02", + "Lingua::Stem::It" : 0, + "Lingua::Stem::Ru" : 0, + "Lingua::Stem::Snowball::Da" : "1.01", + "Lingua::Stem::Snowball::No" : "1.00", + "Lingua::Stem::Snowball::Se" : "1.01", + "Text::German" : 0 } } }, + "provides" : { + "Lingua::Stem" : { + "file" : "lib/Lingua/Stem.pm", + "version" : "0.84" + }, + "Lingua::Stem::AutoLoader" : { + "file" : "lib/Lingua/Stem/AutoLoader.pm", + "version" : "1.02" + }, + "Lingua::Stem::Da" : { + "file" : "lib/Lingua/Stem/Da.pm", + "version" : "1.01" + }, + "Lingua::Stem::De" : { + "file" : "lib/Lingua/Stem/De.pm", + "version" : "1.01" + }, + "Lingua::Stem::En" : { + "file" : "lib/Lingua/Stem/En.pm", + "version" : "2.16" + }, + "Lingua::Stem::EnBroken" : { + "file" : "lib/Lingua/Stem/EnBroken.pm", + "version" : "2.13" + }, + "Lingua::Stem::Gl" : { + "file" : "lib/Lingua/Stem/Gl.pm", + "version" : "1.02" + }, + "Lingua::Stem::No" : { + "file" : "lib/Lingua/Stem/No.pm", + "version" : "1.01" + }, + "Lingua::Stem::Pt" : { + "file" : "lib/Lingua/Stem/Pt.pm", + "version" : "1.01" + }, + "Lingua::Stem::Sv" : { + "file" : "lib/Lingua/Stem/Sv.pm", + "version" : "1.01" + } + }, "release_status" : "stable", "resources" : { "license" : [ - "http://opensource.org/licenses/mit-license.php" + "http://dev.perl.org/licenses/" ] }, - "version" : "0.91" + "version" : "0.84" }, - "name" : "Locale::Maketext::Lexicon", - "pathname" : "D/DR/DRTECH/Locale-Maketext-Lexicon-0.91.tar.gz", + "name" : "Lingua::Stem", + "pathname" : "S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz", "provides" : { - "Locale::Maketext::Extract" : { - "file" : "Locale/Maketext/Extract.pm", - "version" : "0.38" + "Lingua::Stem" : { + "file" : "Lingua/Stem.pm", + "version" : "0.84" }, - "Locale::Maketext::Extract::Plugin::Base" : { - "file" : "Locale/Maketext/Extract/Plugin/Base.pm" + "Lingua::Stem::AutoLoader" : { + "file" : "Lingua/Stem/AutoLoader.pm", + "version" : "1.02" }, - "Locale::Maketext::Extract::Plugin::FormFu" : { - "file" : "Locale/Maketext/Extract/Plugin/FormFu.pm" + "Lingua::Stem::Da" : { + "file" : "Lingua/Stem/Da.pm", + "version" : "1.01" }, - "Locale::Maketext::Extract::Plugin::FormFu::Extractor" : { - "file" : "Locale/Maketext/Extract/Plugin/FormFu.pm" + "Lingua::Stem::De" : { + "file" : "Lingua/Stem/De.pm", + "version" : "1.01" }, - "Locale::Maketext::Extract::Plugin::Generic" : { - "file" : "Locale/Maketext/Extract/Plugin/Generic.pm" + "Lingua::Stem::En" : { + "file" : "Lingua/Stem/En.pm", + "version" : "2.16" }, - "Locale::Maketext::Extract::Plugin::Mason" : { - "file" : "Locale/Maketext/Extract/Plugin/Mason.pm" + "Lingua::Stem::EnBroken" : { + "file" : "Lingua/Stem/EnBroken.pm", + "version" : "2.13" }, - "Locale::Maketext::Extract::Plugin::PPI" : { - "file" : "Locale/Maketext/Extract/Plugin/PPI.pm" + "Lingua::Stem::Gl" : { + "file" : "Lingua/Stem/Gl.pm", + "version" : "1.02" }, - "Locale::Maketext::Extract::Plugin::Perl" : { - "file" : "Locale/Maketext/Extract/Plugin/Perl.pm" + "Lingua::Stem::No" : { + "file" : "Lingua/Stem/No.pm", + "version" : "1.01" }, - "Locale::Maketext::Extract::Plugin::TT2" : { - "file" : "Locale/Maketext/Extract/Plugin/TT2.pm" + "Lingua::Stem::Pt" : { + "file" : "Lingua/Stem/Pt.pm", + "version" : "1.01" }, - "Locale::Maketext::Extract::Plugin::TT2::Directive" : { - "file" : "Locale/Maketext/Extract/Plugin/TT2.pm" + "Lingua::Stem::Sv" : { + "file" : "Lingua/Stem/Sv.pm", + "version" : "1.01" + } + }, + "version" : "0.84" + }, + "Lingua::Stem::Fr" : { + "dist" : "Lingua-Stem-Fr-0.02", + "module" : "Lingua::Stem::Fr", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" }, - "Locale::Maketext::Extract::Plugin::TT2::Parser" : { - "file" : "Locale/Maketext/Extract/Plugin/TT2.pm" + "name" : "Lingua-Stem-Fr", + "no_index" : { + "directory" : [ + "t", + "inc" + ] }, - "Locale::Maketext::Extract::Plugin::TextTemplate" : { - "file" : "Locale/Maketext/Extract/Plugin/TextTemplate.pm", - "version" : "0.31" + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } }, - "Locale::Maketext::Extract::Plugin::TextTemplate::Parser" : { - "file" : "Locale/Maketext/Extract/Plugin/TextTemplate.pm" + "release_status" : "stable", + "version" : "0.02" + }, + "name" : "Lingua::Stem::Fr", + "pathname" : "S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz", + "provides" : { + "Lingua::Stem::Fr" : { + "file" : "Lingua/Stem/Fr.pm", + "version" : "0.02" + } + }, + "version" : "0.02" + }, + "Lingua::Stem::It" : { + "dist" : "Lingua-Stem-It-0.02", + "module" : "Lingua::Stem::It", + "mymeta" : { + "abstract" : "Porter's stemming algorithm for Italian", + "author" : [ + "Aldo Calpini <dada@perl.it>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" }, - "Locale::Maketext::Extract::Plugin::YAML" : { - "file" : "Locale/Maketext/Extract/Plugin/YAML.pm" + "name" : "Lingua-Stem-It", + "no_index" : { + "directory" : [ + "t", + "inc" + ] }, - "Locale::Maketext::Extract::Plugin::YAML::Extractor" : { - "file" : "Locale/Maketext/Extract/Plugin/YAML.pm" + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } }, - "Locale::Maketext::Extract::Run" : { - "file" : "Locale/Maketext/Extract/Run.pm" + "release_status" : "stable", + "version" : "0.02" + }, + "name" : "Lingua::Stem::It", + "pathname" : "A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz", + "provides" : { + "Lingua::Stem::It" : { + "file" : "Lingua/Stem/It.pm", + "version" : "0.02" + } + }, + "version" : "0.02" + }, + "Lingua::Stem::Ru" : { + "dist" : "Lingua-Stem-Ru-0.01", + "module" : "Lingua::Stem::Ru", + "mymeta" : { + "abstract" : "Porter's stemming algorithm for Russian", + "author" : [ + "Aleksandr Guidrevitch <pillgrim@mail.ru>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" }, - "Locale::Maketext::Lexicon" : { - "file" : "Locale/Maketext/Lexicon.pm", - "version" : "0.91" + "name" : "Lingua-Stem-Ru", + "no_index" : { + "directory" : [ + "t", + "inc" + ] }, - "Locale::Maketext::Lexicon::Auto" : { - "file" : "Locale/Maketext/Lexicon/Auto.pm", - "version" : "0.10" + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } }, - "Locale::Maketext::Lexicon::Extract::Run" : { - "file" : "Locale/Maketext/Extract/Run.pm", - "version" : "0.35" + "release_status" : "stable", + "version" : "0.01" + }, + "name" : "Lingua::Stem::Ru", + "pathname" : "A/AL/ALGDR/Lingua-Stem-Ru-0.01.tar.gz", + "provides" : { + "Lingua::Stem::Ru" : { + "file" : "Lingua/Stem/Ru.pm", + "version" : "0.01" + } + }, + "version" : "0.01" + }, + "Lingua::Stem::Snowball::Da" : { + "dist" : "Lingua-Stem-Snowball-Da-1.01", + "module" : "Lingua::Stem::Snowball::Da", + "mymeta" : { + "abstract" : "Porters stemming algorithm for Denmark", + "author" : [ + "Dennis Haney <davh@davh.dk>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" }, - "Locale::Maketext::Lexicon::Gettext" : { - "file" : "Locale/Maketext/Lexicon/Gettext.pm", - "version" : "0.17" + "name" : "Lingua-Stem-Snowball-Da", + "no_index" : { + "directory" : [ + "t", + "inc" + ] }, - "Locale::Maketext::Lexicon::Msgcat" : { - "file" : "Locale/Maketext/Lexicon/Msgcat.pm", - "version" : "0.03" + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } }, - "Locale::Maketext::Lexicon::Tie" : { - "file" : "Locale/Maketext/Lexicon/Tie.pm", - "version" : "0.05" + "release_status" : "stable", + "version" : "1.01" + }, + "name" : "Lingua::Stem::Snowball::Da", + "pathname" : "C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz", + "provides" : { + "Lingua::Stem::Snowball::Da" : { + "file" : "Lingua/Stem/Snowball/Da.pm", + "version" : "1.01" + } + }, + "version" : "1.01" + }, + "Lingua::Stem::Snowball::No" : { + "dist" : "Snowball-Norwegian-1.2", + "module" : "Lingua::Stem::Snowball::No", + "mymeta" : { + "abstract" : "Porters stemming algorithm for norwegian.", + "author" : [ + "Ask Solem <ASKSH@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Snowball-Norwegian", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.42" + } + } + }, + "provides" : { + "Lingua::Stem::Snowball::No" : { + "file" : "lib/Lingua/Stem/Snowball/No.pm", + "version" : "1.2" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "1.2" + }, + "name" : "Lingua::Stem::Snowball::No", + "pathname" : "A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz", + "provides" : { + "Lingua::Stem::Snowball::No" : { + "file" : "Lingua/Stem/Snowball/No.pm", + "version" : "1.2" + } + }, + "version" : "1.2" + }, + "Lingua::Stem::Snowball::Se" : { + "dist" : "Snowball-Swedish-1.2", + "module" : "Lingua::Stem::Snowball::Se", + "mymeta" : { + "abstract" : "Porters stemming algorithm for swedish.", + "author" : [ + "Ask Solem <ASKSH@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Snowball-Swedish", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.42" + } + } + }, + "provides" : { + "Lingua::Stem::Snowball::Se" : { + "file" : "lib/Lingua/Stem/Snowball/Se.pm", + "version" : "1.2" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "1.2" + }, + "name" : "Lingua::Stem::Snowball::Se", + "pathname" : "A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz", + "provides" : { + "Lingua::Stem::Snowball::Se" : { + "file" : "Lingua/Stem/Snowball/Se.pm", + "version" : "1.2" + } + }, + "version" : "1.2" + }, + "List::MoreUtils" : { + "dist" : "List-MoreUtils-0.33", + "module" : "List::MoreUtils", + "mymeta" : { + "abstract" : "Provide the stuff missing in List::Util", + "author" : [ + "Tassilo von Parseval <tassilo.von.parseval@rwth-aachen.de>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "List-MoreUtils", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.42" + } + }, + "configure" : { + "requires" : { + "ExtUtils::CBuilder" : "0.27", + "ExtUtils::MakeMaker" : "6.52" + } + }, + "runtime" : { + "requires" : { + "Test::More" : "0.82", + "perl" : "5.00503" + } + } + }, + "release_status" : "stable", + "version" : "0.33" + }, + "name" : "List::MoreUtils", + "pathname" : "A/AD/ADAMK/List-MoreUtils-0.33.tar.gz", + "provides" : { + "List::MoreUtils" : { + "file" : "List/MoreUtils.pm", + "version" : "0.33" } }, - "version" : "0.91" + "version" : "0.33" }, "Log::Log4perl" : { "dist" : "Log-Log4perl-1.34", @@ -16595,91 +17511,24 @@ }, "version" : "2.08" }, - "Math::BigInt" : { - "dist" : "Math-BigInt-1.997", - "module" : "Math::BigInt", - "mymeta" : { - "abstract" : "Arbitrary size integer/float math package", - "author" : [ - "Original code by Mark Biggar, overloaded interface by Ilya Zakharevich., Tels <nospam-abuse@bloodgate.com>" - ], - "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150", - "license" : [ - "perl_5" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" - }, - "name" : "Math-BigInt", - "no_index" : { - "directory" : [ - "t", - "inc" - ] - }, - "prereqs" : { - "build" : { - "requires" : { - "ExtUtils::MakeMaker" : "6.42", - "Test::More" : "0.62" - } - }, - "configure" : { - "requires" : { - "ExtUtils::MakeMaker" : 0 - } - }, - "runtime" : { - "requires" : { - "perl" : "5.006002" - } - } - }, - "release_status" : "stable", - "version" : "1.997" - }, - "name" : "Math::BigInt", - "pathname" : "P/PJ/PJACKLAM/Math-BigInt-1.997.tar.gz", - "provides" : { - "Math::BigFloat" : { - "file" : "Math/BigFloat.pm", - "version" : "1.997" - }, - "Math::BigInt" : { - "file" : "Math/BigInt.pm", - "version" : "1.997" - }, - "Math::BigInt::Calc" : { - "file" : "Math/BigInt/Calc.pm", - "version" : "1.997" - }, - "Math::BigInt::CalcEmu" : { - "file" : "Math/BigInt/CalcEmu.pm", - "version" : "1.997" - } - }, - "version" : "1.997" - }, - "Math::BigInt::GMP" : { - "dist" : "Math-BigInt-GMP-1.37", - "module" : "Math::BigInt::GMP", + "Math::Round" : { + "dist" : "Math-Round-0.06", + "module" : "Math::Round", "mymeta" : { - "abstract" : "Use the GMP library for Math::BigInt routines", + "abstract" : "unknown", "author" : [ - "Tels" + "unknown" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", "license" : [ - "perl_5" + "unknown" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "Math-BigInt-GMP", + "name" : "Math-Round", "no_index" : { "directory" : [ "t", @@ -16698,28 +17547,25 @@ } }, "runtime" : { - "requires" : { - "Math::BigInt" : "1.997", - "XSLoader" : "0.02" - } + "requires" : {} } }, "release_status" : "stable", - "version" : "1.37" + "version" : "0.06" }, - "name" : "Math::BigInt::GMP", - "pathname" : "P/PJ/PJACKLAM/Math-BigInt-GMP-1.37.tar.gz", + "name" : "Math::Round", + "pathname" : "G/GR/GROMMEL/Math-Round-0.06.tar.gz", "provides" : { - "Math::BigInt::GMP" : { - "file" : "Math/BigInt/GMP.pm", - "version" : "1.37" + "Math::Round" : { + "file" : "Math/Round.pm", + "version" : "0.06" } }, - "version" : "1.37" + "version" : "0.06" }, - "Math::Round" : { - "dist" : "Math-Round-0.06", - "module" : "Math::Round", + "Memoize::ExpireLRU" : { + "dist" : "Memoize-ExpireLRU-0.55", + "module" : "Memoize::ExpireLRU", "mymeta" : { "abstract" : "unknown", "author" : [ @@ -16734,7 +17580,7 @@ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "Math-Round", + "name" : "Memoize-ExpireLRU", "no_index" : { "directory" : [ "t", @@ -16753,21 +17599,23 @@ } }, "runtime" : { - "requires" : {} + "requires" : { + "Memoize" : "0.52" + } } }, "release_status" : "stable", - "version" : "0.06" + "version" : "0.55" }, - "name" : "Math::Round", - "pathname" : "G/GR/GROMMEL/Math-Round-0.06.tar.gz", + "name" : "Memoize::ExpireLRU", + "pathname" : "B/BP/BPOWERS/Memoize-ExpireLRU-0.55.tar.gz", "provides" : { - "Math::Round" : { - "file" : "Math/Round.pm", - "version" : "0.06" + "Memoize::ExpireLRU" : { + "file" : "Memoize/ExpireLRU.pm", + "version" : "0.55" } }, - "version" : "0.06" + "version" : "0.55" }, "Module::Build" : { "dist" : "Module-Build-0.3800", @@ -17312,7 +18160,7 @@ "version" : "0.10" }, "Module::Metadata" : { - "dist" : "Module-Metadata-1.000007", + "dist" : "Module-Metadata-1.000009", "module" : "Module::Metadata", "mymeta" : { "abstract" : "Gather package and POD information from perl module files", @@ -17320,7 +18168,7 @@ "Ken Williams <kwilliams@cpan.org>, Randy W. Sims <RandyS@ThePierianSpring.org>" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621, CPAN::Meta::Converter version 2.112150", "license" : [ "perl_5" ], @@ -17348,22 +18196,29 @@ }, "runtime" : { "requires" : { - "version" : "0.87" + "Carp" : 0, + "File::Find" : 0, + "File::Spec" : 0, + "IO::File" : 0, + "strict" : 0, + "vars" : 0, + "version" : "0.87", + "warnings" : 0 } } }, "release_status" : "stable", - "version" : "1.000007" + "version" : "1.000009" }, "name" : "Module::Metadata", - "pathname" : "D/DA/DAGOLDEN/Module-Metadata-1.000007.tar.gz", + "pathname" : "D/DA/DAGOLDEN/Module-Metadata-1.000009.tar.gz", "provides" : { "Module::Metadata" : { "file" : "Module/Metadata.pm", - "version" : "1.000007" + "version" : "1.000009" } }, - "version" : "1.000007" + "version" : "1.000009" }, "Module::Runtime" : { "dist" : "Module-Runtime-0.011", @@ -22024,6 +22879,1040 @@ }, "version" : "1.666001" }, + "SOAP::WSDL" : { + "dist" : "SOAP-WSDL-2.00.10", + "module" : "SOAP::WSDL::Client::Base", + "mymeta" : { + "abstract" : "SOAP with WSDL support", + "author" : [ + "Martin Kutter <martin.kutter@fen-net.de>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "artistic_1" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "SOAP-WSDL", + "no_index" : { + "directory" : [ + "lib/SOAP/WSDL/Generator/Template/XSD/" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "Class::Std::Fast" : "v0.0.5", + "Cwd" : 0, + "Date::Format" : 0, + "Date::Parse" : 0, + "File::Basename" : 0, + "File::Path" : 0, + "File::Spec" : 0, + "Getopt::Long" : 0, + "LWP::UserAgent" : 0, + "List::Util" : 0, + "Module::Build" : 0, + "Storable" : 0, + "Template" : "2.18", + "Test::More" : 0, + "XML::Parser::Expat" : 0 + } + }, + "runtime" : { + "requires" : { + "Class::Std::Fast" : "v0.0.5", + "Data::Dumper" : 0, + "Date::Format" : 0, + "Date::Parse" : 0, + "File::Basename" : 0, + "File::Path" : 0, + "Getopt::Long" : 0, + "LWP::UserAgent" : 0, + "List::Util" : 0, + "Template" : "2.18", + "Term::ReadKey" : 0, + "URI" : 0, + "XML::Parser::Expat" : 0, + "perl" : "v5.8.0" + } + } + }, + "provides" : { + "SOAP::WSDL" : { + "file" : "lib/SOAP/WSDL.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Base" : { + "file" : "lib/SOAP/WSDL/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Binding" : { + "file" : "lib/SOAP/WSDL/Binding.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client" : { + "file" : "lib/SOAP/WSDL/Client.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client::Base" : { + "file" : "lib/SOAP/WSDL/Client/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Definitions" : { + "file" : "lib/SOAP/WSDL/Definitions.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::Hash" : { + "file" : "lib/SOAP/WSDL/Deserializer/Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::SOM" : { + "file" : "lib/SOAP/WSDL/Deserializer/SOM.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::XSD" : { + "file" : "lib/SOAP/WSDL/Deserializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Base" : { + "file" : "lib/SOAP/WSDL/Expat/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Message2Hash" : { + "file" : "lib/SOAP/WSDL/Expat/Message2Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageParser" : { + "file" : "lib/SOAP/WSDL/Expat/MessageParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageStreamParser" : { + "file" : "lib/SOAP/WSDL/Expat/MessageStreamParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::WSDLParser" : { + "file" : "lib/SOAP/WSDL/Expat/WSDLParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Deserializer" : { + "file" : "lib/SOAP/WSDL/Factory/Deserializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Generator" : { + "file" : "lib/SOAP/WSDL/Factory/Generator.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Serializer" : { + "file" : "lib/SOAP/WSDL/Factory/Serializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Transport" : { + "file" : "lib/SOAP/WSDL/Factory/Transport.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Iterator::WSDL11" : { + "file" : "lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::PrefixResolver" : { + "file" : "lib/SOAP/WSDL/Generator/PrefixResolver.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template" : { + "file" : "lib/SOAP/WSDL/Generator/Template.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::Plugin::XSD" : { + "file" : "lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::XSD" : { + "file" : "lib/SOAP/WSDL/Generator/Template/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor" : { + "file" : "lib/SOAP/WSDL/Generator/Visitor.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor::Typemap" : { + "file" : "lib/SOAP/WSDL/Generator/Visitor/Typemap.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Message" : { + "file" : "lib/SOAP/WSDL/Message.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::OpMessage" : { + "file" : "lib/SOAP/WSDL/OpMessage.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Operation" : { + "file" : "lib/SOAP/WSDL/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Part" : { + "file" : "lib/SOAP/WSDL/Part.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Port" : { + "file" : "lib/SOAP/WSDL/Port.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::PortType" : { + "file" : "lib/SOAP/WSDL/PortType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Address" : { + "file" : "lib/SOAP/WSDL/SOAP/Address.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Body" : { + "file" : "lib/SOAP/WSDL/SOAP/Body.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Header" : { + "file" : "lib/SOAP/WSDL/SOAP/Header.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::HeaderFault" : { + "file" : "lib/SOAP/WSDL/SOAP/HeaderFault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Operation" : { + "file" : "lib/SOAP/WSDL/SOAP/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault" : { + "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11" : { + "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11Detail" : { + "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm", + "version" : 0 + }, + "SOAP::WSDL::Serializer::XSD" : { + "file" : "lib/SOAP/WSDL/Serializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server" : { + "file" : "lib/SOAP/WSDL/Server.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::CGI" : { + "file" : "lib/SOAP/WSDL/Server/CGI.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Mod_Perl2" : { + "file" : "lib/SOAP/WSDL/Server/Mod_Perl2.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Simple" : { + "file" : "lib/SOAP/WSDL/Server/Simple.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Service" : { + "file" : "lib/SOAP/WSDL/Service.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::HTTP" : { + "file" : "lib/SOAP/WSDL/Transport/HTTP.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Loopback" : { + "file" : "lib/SOAP/WSDL/Transport/Loopback.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Test" : { + "file" : "lib/SOAP/WSDL/Transport/Test.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::TypeLookup" : { + "file" : "lib/SOAP/WSDL/TypeLookup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Types" : { + "file" : "lib/SOAP/WSDL/Types.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Annotation" : { + "file" : "lib/SOAP/WSDL/XSD/Annotation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Attribute" : { + "file" : "lib/SOAP/WSDL/XSD/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::AttributeGroup" : { + "file" : "lib/SOAP/WSDL/XSD/AttributeGroup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Builtin" : { + "file" : "lib/SOAP/WSDL/XSD/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::ComplexType" : { + "file" : "lib/SOAP/WSDL/XSD/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Element" : { + "file" : "lib/SOAP/WSDL/XSD/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Enumeration" : { + "file" : "lib/SOAP/WSDL/XSD/Enumeration.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::FractionDigits" : { + "file" : "lib/SOAP/WSDL/XSD/FractionDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Group" : { + "file" : "lib/SOAP/WSDL/XSD/Group.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Length" : { + "file" : "lib/SOAP/WSDL/XSD/Length.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxExclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MaxExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxInclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MaxInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxLength" : { + "file" : "lib/SOAP/WSDL/XSD/MaxLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinExclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MinExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinInclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MinInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinLength" : { + "file" : "lib/SOAP/WSDL/XSD/MinLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Pattern" : { + "file" : "lib/SOAP/WSDL/XSD/Pattern.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema" : { + "file" : "lib/SOAP/WSDL/XSD/Schema.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema::Builtin" : { + "file" : "lib/SOAP/WSDL/XSD/Schema/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::SimpleType" : { + "file" : "lib/SOAP/WSDL/XSD/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::TotalDigits" : { + "file" : "lib/SOAP/WSDL/XSD/TotalDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Attribute" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::AttributeSet" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/AttributeSet.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ENTITY" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ID" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/ID.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREF" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREFS" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NCName" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NOTATION" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::Name" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/Name.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::QName" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/QName.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyURI" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::base64Binary" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::boolean" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::byte" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/byte.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::date" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/date.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::dateTime" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::decimal" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::double" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/double.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::duration" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/duration.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::float" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/float.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gDay" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonth" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYear" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::hexBinary" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::int" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/int.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::integer" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/integer.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::language" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/language.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::list" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/list.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::long" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/long.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::normalizedString" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::short" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/short.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::string" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::time" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/time.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::token" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/token.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::ComplexType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Element" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType::restriction" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::WhiteSpace" : { + "file" : "lib/SOAP/WSDL/XSD/WhiteSpace.pm", + "version" : "v2.0.10" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://opensource.org/licenses/artistic-license.php" + ] + }, + "version" : "2.00.10" + }, + "name" : "SOAP::WSDL", + "pathname" : "M/MK/MKUTTER/SOAP-WSDL-2.00.10.tar.gz", + "provides" : { + "SOAP::WSDL" : { + "file" : "SOAP/WSDL.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Base" : { + "file" : "SOAP/WSDL/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Binding" : { + "file" : "SOAP/WSDL/Binding.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client" : { + "file" : "SOAP/WSDL/Client.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client::Base" : { + "file" : "SOAP/WSDL/Client/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Definitions" : { + "file" : "SOAP/WSDL/Definitions.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::Hash" : { + "file" : "SOAP/WSDL/Deserializer/Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::SOM" : { + "file" : "SOAP/WSDL/Deserializer/SOM.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::XSD" : { + "file" : "SOAP/WSDL/Deserializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Base" : { + "file" : "SOAP/WSDL/Expat/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Message2Hash" : { + "file" : "SOAP/WSDL/Expat/Message2Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageParser" : { + "file" : "SOAP/WSDL/Expat/MessageParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageStreamParser" : { + "file" : "SOAP/WSDL/Expat/MessageStreamParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::WSDLParser" : { + "file" : "SOAP/WSDL/Expat/WSDLParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Deserializer" : { + "file" : "SOAP/WSDL/Factory/Deserializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Generator" : { + "file" : "SOAP/WSDL/Factory/Generator.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Serializer" : { + "file" : "SOAP/WSDL/Factory/Serializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Transport" : { + "file" : "SOAP/WSDL/Factory/Transport.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Iterator::WSDL11" : { + "file" : "SOAP/WSDL/Generator/Iterator/WSDL11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::PrefixResolver" : { + "file" : "SOAP/WSDL/Generator/PrefixResolver.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template" : { + "file" : "SOAP/WSDL/Generator/Template.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::Plugin::XSD" : { + "file" : "SOAP/WSDL/Generator/Template/Plugin/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::XSD" : { + "file" : "SOAP/WSDL/Generator/Template/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor" : { + "file" : "SOAP/WSDL/Generator/Visitor.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor::Typemap" : { + "file" : "SOAP/WSDL/Generator/Visitor/Typemap.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Message" : { + "file" : "SOAP/WSDL/Message.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::OpMessage" : { + "file" : "SOAP/WSDL/OpMessage.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Operation" : { + "file" : "SOAP/WSDL/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Part" : { + "file" : "SOAP/WSDL/Part.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Port" : { + "file" : "SOAP/WSDL/Port.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::PortType" : { + "file" : "SOAP/WSDL/PortType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Address" : { + "file" : "SOAP/WSDL/SOAP/Address.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Body" : { + "file" : "SOAP/WSDL/SOAP/Body.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Header" : { + "file" : "SOAP/WSDL/SOAP/Header.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::HeaderFault" : { + "file" : "SOAP/WSDL/SOAP/HeaderFault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Operation" : { + "file" : "SOAP/WSDL/SOAP/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault" : { + "file" : "SOAP/WSDL/SOAP/Typelib/Fault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11" : { + "file" : "SOAP/WSDL/SOAP/Typelib/Fault11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11Detail" : { + "file" : "SOAP/WSDL/SOAP/Typelib/Fault11.pm" + }, + "SOAP::WSDL::Serializer::XSD" : { + "file" : "SOAP/WSDL/Serializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server" : { + "file" : "SOAP/WSDL/Server.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::CGI" : { + "file" : "SOAP/WSDL/Server/CGI.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Mod_Perl2" : { + "file" : "SOAP/WSDL/Server/Mod_Perl2.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Simple" : { + "file" : "SOAP/WSDL/Server/Simple.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Service" : { + "file" : "SOAP/WSDL/Service.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::HTTP" : { + "file" : "SOAP/WSDL/Transport/HTTP.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Loopback" : { + "file" : "SOAP/WSDL/Transport/Loopback.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Test" : { + "file" : "SOAP/WSDL/Transport/Test.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::TypeLookup" : { + "file" : "SOAP/WSDL/TypeLookup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Types" : { + "file" : "SOAP/WSDL/Types.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Annotation" : { + "file" : "SOAP/WSDL/XSD/Annotation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Attribute" : { + "file" : "SOAP/WSDL/XSD/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::AttributeGroup" : { + "file" : "SOAP/WSDL/XSD/AttributeGroup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Builtin" : { + "file" : "SOAP/WSDL/XSD/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::ComplexType" : { + "file" : "SOAP/WSDL/XSD/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Element" : { + "file" : "SOAP/WSDL/XSD/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Enumeration" : { + "file" : "SOAP/WSDL/XSD/Enumeration.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::FractionDigits" : { + "file" : "SOAP/WSDL/XSD/FractionDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Group" : { + "file" : "SOAP/WSDL/XSD/Group.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Length" : { + "file" : "SOAP/WSDL/XSD/Length.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxExclusive" : { + "file" : "SOAP/WSDL/XSD/MaxExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxInclusive" : { + "file" : "SOAP/WSDL/XSD/MaxInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxLength" : { + "file" : "SOAP/WSDL/XSD/MaxLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinExclusive" : { + "file" : "SOAP/WSDL/XSD/MinExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinInclusive" : { + "file" : "SOAP/WSDL/XSD/MinInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinLength" : { + "file" : "SOAP/WSDL/XSD/MinLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Pattern" : { + "file" : "SOAP/WSDL/XSD/Pattern.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema" : { + "file" : "SOAP/WSDL/XSD/Schema.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema::Builtin" : { + "file" : "SOAP/WSDL/XSD/Schema/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::SimpleType" : { + "file" : "SOAP/WSDL/XSD/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::TotalDigits" : { + "file" : "SOAP/WSDL/XSD/TotalDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Attribute" : { + "file" : "SOAP/WSDL/XSD/Typelib/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::AttributeSet" : { + "file" : "SOAP/WSDL/XSD/Typelib/AttributeSet.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ENTITY" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ID" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/ID.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREF" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREFS" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NCName" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NOTATION" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::Name" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/Name.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::QName" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/QName.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyType" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyURI" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::base64Binary" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::boolean" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::byte" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/byte.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::date" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/date.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::dateTime" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::decimal" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::double" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/double.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::duration" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/duration.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::float" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/float.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gDay" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonth" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYear" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::hexBinary" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::int" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/int.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::integer" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/integer.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::language" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/language.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::list" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/list.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::long" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/long.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::normalizedString" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::short" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/short.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::string" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/string.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::time" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/time.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::token" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/token.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm" + }, + "SOAP::WSDL::XSD::Typelib::ComplexType" : { + "file" : "SOAP/WSDL/XSD/Typelib/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Element" : { + "file" : "SOAP/WSDL/XSD/Typelib/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType" : { + "file" : "SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType::restriction" : { + "file" : "SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::WhiteSpace" : { + "file" : "SOAP/WSDL/XSD/WhiteSpace.pm", + "version" : "v2.0.10" + } + }, + "version" : "v2.0.10" + }, "SQL::Abstract" : { "dist" : "SQL-Abstract-1.72", "module" : "SQL::Abstract", @@ -22385,6 +24274,57 @@ }, "version" : "1.4" }, + "String::CamelCase" : { + "dist" : "String-CamelCase-0.02", + "module" : "String::CamelCase", + "mymeta" : { + "abstract" : "camelcase, de-camelcase", + "author" : [ + "YAMASHINA Hio <hio@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MY_Metafile version 0.09, EUMM-6.17., CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "String-CamelCase", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Test::More" : 0 + } + } + }, + "release_status" : "stable", + "version" : "0.02", + "x_installdirs" : "site", + "x_version_from" : "lib/String/CamelCase.pm" + }, + "name" : "String::CamelCase", + "pathname" : "H/HI/HIO/String-CamelCase-0.02.tar.gz", + "provides" : { + "String::CamelCase" : { + "file" : "String/CamelCase.pm", + "version" : "0.02" + } + }, + "version" : "0.02" + }, "String::RewritePrefix" : { "dist" : "String-RewritePrefix-0.006", "module" : "String::RewritePrefix", @@ -22617,6 +24557,89 @@ }, "version" : "0.006" }, + "String::ToIdentifier::EN" : { + "dist" : "String-ToIdentifier-EN-0.07", + "module" : "String::ToIdentifier::EN", + "mymeta" : { + "abstract" : "Convert Strings to English Program Identifiers", + "author" : [ + "Rafael Kitover, C<< <rkitover@cpan.org> >>", + "Rafael Kitover <rkitover@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "String-ToIdentifier-EN", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62", + "Test::More" : "0.92" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62" + } + }, + "runtime" : { + "requires" : { + "Exporter" : "5.57", + "Lingua::EN::Inflect::Phrase" : "0.07", + "Test::More" : "0.92", + "Text::Unidecode" : "0.04", + "namespace::clean" : "0.20", + "perl" : "5.008001" + } + } + }, + "provides" : { + "String::ToIdentifier::EN" : { + "file" : "lib/String/ToIdentifier/EN.pm", + "version" : "0.07" + }, + "String::ToIdentifier::EN::Unicode" : { + "file" : "lib/String/ToIdentifier/EN/Unicode.pm", + "version" : 0 + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/rkitover/string-toidentifier-en.git" + } + }, + "version" : "0.07" + }, + "name" : "String::ToIdentifier::EN", + "pathname" : "R/RK/RKITOVER/String-ToIdentifier-EN-0.07.tar.gz", + "provides" : { + "String::ToIdentifier::EN" : { + "file" : "String/ToIdentifier/EN.pm", + "version" : "0.07" + }, + "String::ToIdentifier::EN::Unicode" : { + "file" : "String/ToIdentifier/EN/Unicode.pm" + } + }, + "version" : "0.07" + }, "Sub::Exporter" : { "dist" : "Sub-Exporter-0.982", "module" : "Sub::Exporter", @@ -23347,6 +25370,58 @@ }, "version" : "1.00" }, + "Term::ReadKey" : { + "dist" : "TermReadKey-2.30", + "module" : "Term::ReadKey", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "TermReadKey", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "2.30" + }, + "name" : "Term::ReadKey", + "pathname" : "J/JS/JSTOWE/TermReadKey-2.30.tar.gz", + "provides" : { + "Term::ReadKey" : { + "file" : "Term/ReadKey.pm", + "version" : "2.30" + } + }, + "version" : "2.30" + }, "Test::Base" : { "dist" : "Test-Base-0.60", "module" : "Test::Base", @@ -24883,6 +26958,82 @@ }, "version" : "0.02" }, + "Text::German" : { + "dist" : "Text-German-0.06", + "module" : "Text::German", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Text-German", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.06" + }, + "name" : "Text::German", + "pathname" : "U/UL/ULPFR/Text-German-0.06.tar.gz", + "provides" : { + "Text::German" : { + "file" : "Text/German.pm", + "version" : "0.06" + }, + "Text::German::Adjektiv" : { + "file" : "Text/German/Adjektiv.pm" + }, + "Text::German::Ausnahme" : { + "file" : "Text/German/Ausnahme.pm" + }, + "Text::German::Cache" : { + "file" : "Text/German/Cache.pm" + }, + "Text::German::Endung" : { + "file" : "Text/German/Endung.pm" + }, + "Text::German::Regel" : { + "file" : "Text/German/Regel.pm" + }, + "Text::German::Util" : { + "file" : "Text/German/Util.pm" + }, + "Text::German::Verb" : { + "file" : "Text/German/Verb.pm" + }, + "Text::German::Vorsilbe" : { + "file" : "Text/German/Vorsilbe.pm" + } + }, + "version" : "0.06" + }, "Text::Glob" : { "dist" : "Text-Glob-0.09", "module" : "Text::Glob", @@ -25046,6 +27197,58 @@ }, "version" : "1.45" }, + "Text::Unidecode" : { + "dist" : "Text-Unidecode-0.04", + "module" : "Text::Unidecode", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Text-Unidecode", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.04" + }, + "name" : "Text::Unidecode", + "pathname" : "S/SB/SBURKE/Text-Unidecode-0.04.tar.gz", + "provides" : { + "Text::Unidecode" : { + "file" : "Text/Unidecode.pm", + "version" : "0.04" + } + }, + "version" : "0.04" + }, "Tie::IxHash" : { "dist" : "Tie-IxHash-1.22", "module" : "Tie::IxHash", @@ -26362,216 +28565,6 @@ }, "version" : "1.11" }, - "XML::Parser" : { - "dist" : "XML-Parser-2.41", - "module" : "XML::Parser", - "mymeta" : { - "abstract" : "A perl module for parsing XML documents", - "author" : [ - "Clark Cooper (coopercc@netheaven.com)" - ], - "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", - "license" : [ - "perl_5" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" - }, - "name" : "XML-Parser", - "no_index" : { - "directory" : [ - "t", - "inc" - ] - }, - "prereqs" : { - "build" : { - "requires" : { - "ExtUtils::MakeMaker" : 0 - } - }, - "configure" : { - "requires" : { - "ExtUtils::MakeMaker" : 0 - } - }, - "runtime" : { - "requires" : { - "LWP" : 0, - "perl" : "5.00405" - } - } - }, - "release_status" : "stable", - "resources" : { - "repository" : { - "url" : "http://github.com/chorny/XML-Parser" - } - }, - "version" : "2.41" - }, - "name" : "XML::Parser", - "pathname" : "T/TO/TODDR/XML-Parser-2.41.tar.gz", - "provides" : { - "XML::Parser" : { - "file" : "XML/Parser.pm", - "version" : "2.41" - }, - "XML::Parser::Expat" : { - "file" : "XML/Parser/Expat.pm", - "version" : "2.41" - }, - "XML::Parser::Style::Debug" : { - "file" : "XML/Parser/Style/Debug.pm" - }, - "XML::Parser::Style::Objects" : { - "file" : "XML/Parser/Style/Objects.pm" - }, - "XML::Parser::Style::Stream" : { - "file" : "XML/Parser/Style/Stream.pm" - }, - "XML::Parser::Style::Subs" : { - "file" : "XML/Parser/Style/Subs.pm" - }, - "XML::Parser::Style::Tree" : { - "file" : "XML/Parser/Style/Tree.pm" - } - }, - "version" : "2.41" - }, - "XML::RSS" : { - "dist" : "XML-RSS-1.49", - "module" : "XML::RSS", - "mymeta" : { - "abstract" : "creates and updates RSS files", - "author" : [ - "Shlomi Fish <shlomif@cpan.org>" - ], - "dynamic_config" : 0, - "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", - "keywords" : [ - "feed", - "feeds", - "generate", - "generating", - "parse", - "parsing", - "rss", - "RSS", - "web-feed", - "web-feeds", - "xml" - ], - "license" : [ - "perl_5" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" - }, - "name" : "XML-RSS", - "prereqs" : { - "build" : { - "requires" : { - "Test::Manifest" : "0.9", - "Test::More" : 0 - } - }, - "configure" : { - "requires" : { - "Module::Build" : "0.36" - } - }, - "runtime" : { - "requires" : { - "DateTime" : 0, - "DateTime::Format::Mail" : 0, - "DateTime::Format::W3CDTF" : 0, - "HTML::Entities" : 0, - "XML::Parser" : "2.23", - "perl" : "5.008" - } - } - }, - "provides" : { - "XML::RSS" : { - "file" : "lib/XML/RSS.pm", - "version" : "1.49" - }, - "XML::RSS::Private::Output::Base" : { - "file" : "lib/XML/RSS/Private/Output/Base.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::Roles::ImageDims" : { - "file" : "lib/XML/RSS/Private/Output/Roles/ImageDims.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::Roles::ModulesElems" : { - "file" : "lib/XML/RSS/Private/Output/Roles/ModulesElems.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V0_9" : { - "file" : "lib/XML/RSS/Private/Output/V0_9.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V0_91" : { - "file" : "lib/XML/RSS/Private/Output/V0_91.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V1_0" : { - "file" : "lib/XML/RSS/Private/Output/V1_0.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V2_0" : { - "file" : "lib/XML/RSS/Private/Output/V2_0.pm", - "version" : 0 - } - }, - "release_status" : "stable", - "resources" : { - "homepage" : "http://perl-rss.sourceforge.net/", - "license" : [ - "http://dev.perl.org/licenses/" - ], - "repository" : { - "url" : "https://svn.perl.org/modules/XML-RSS/trunk" - } - }, - "version" : "1.49" - }, - "name" : "XML::RSS", - "pathname" : "S/SH/SHLOMIF/XML-RSS-1.49.tar.gz", - "provides" : { - "XML::RSS" : { - "file" : "XML/RSS.pm", - "version" : "1.49" - }, - "XML::RSS::Private::Output::Base" : { - "file" : "XML/RSS/Private/Output/Base.pm" - }, - "XML::RSS::Private::Output::Roles::ImageDims" : { - "file" : "XML/RSS/Private/Output/Roles/ImageDims.pm" - }, - "XML::RSS::Private::Output::Roles::ModulesElems" : { - "file" : "XML/RSS/Private/Output/Roles/ModulesElems.pm" - }, - "XML::RSS::Private::Output::V0_9" : { - "file" : "XML/RSS/Private/Output/V0_9.pm" - }, - "XML::RSS::Private::Output::V0_91" : { - "file" : "XML/RSS/Private/Output/V0_91.pm" - }, - "XML::RSS::Private::Output::V1_0" : { - "file" : "XML/RSS/Private/Output/V1_0.pm" - }, - "XML::RSS::Private::Output::V2_0" : { - "file" : "XML/RSS/Private/Output/V2_0.pm" - } - }, - "version" : "1.49" - }, "XML::SAX" : { "dist" : "XML-SAX-0.99", "module" : "XML::SAX", @@ -27051,6 +29044,130 @@ }, "version" : "0.30" }, + "carton" : { + "dist" : "carton-v0.9.3", + "module" : "Carton", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "Tatsuhiko Miyagawa" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.03, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "carton", + "no_index" : { + "directory" : [ + "inc", + "t", + "xt" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62", + "Test::More" : "0.88", + "Test::Requires" : 0, + "version" : "0.77" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.59", + "version" : "0.77" + } + }, + "runtime" : { + "requires" : { + "App::cpanminus" : "1.5", + "CPAN::Meta" : "2.112", + "Exception::Class" : "1.32", + "ExtUtils::MakeMaker" : "6.59", + "JSON" : "2.53", + "Module::Build" : "0.38", + "Module::Metadata" : "1.000003", + "Term::ANSIColor" : "1.12", + "Try::Tiny" : "0.09", + "local::lib" : "1.008", + "parent" : "0.223", + "perl" : "5.008001" + } + } + }, + "provides" : { + "Carton" : { + "file" : "lib/Carton.pm", + "version" : "v0.9.3" + }, + "Carton::CLI" : { + "file" : "lib/Carton/CLI.pm", + "version" : 0 + }, + "Carton::Error" : { + "file" : "lib/Carton/Error.pm", + "version" : 0 + }, + "Carton::Tree" : { + "file" : "lib/Carton/Tree.pm", + "version" : 0 + }, + "Carton::TreeNode" : { + "file" : "lib/Carton/Tree.pm", + "version" : 0 + }, + "Carton::Util" : { + "file" : "lib/Carton/Util.pm", + "version" : 0 + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "https://github.com/miyagawa/carton/issues" + }, + "homepage" : "https://github.com/miyagawa/carton", + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/miyagawa/carton.git" + } + }, + "version" : "v0.9.3" + }, + "name" : "carton", + "pathname" : "M/MI/MIYAGAWA/carton-v0.9.3.tar.gz", + "provides" : { + "Carton" : { + "file" : "Carton.pm", + "version" : "v0.9.3" + }, + "Carton::CLI" : { + "file" : "Carton/CLI.pm" + }, + "Carton::Error" : { + "file" : "Carton/Error.pm" + }, + "Carton::Tree" : { + "file" : "Carton/Tree.pm" + }, + "Carton::TreeNode" : { + "file" : "Carton/Tree.pm" + }, + "Carton::Util" : { + "file" : "Carton/Util.pm" + } + }, + "version" : "v0.9.3" + }, "local::lib" : { "dist" : "local-lib-1.008004", "module" : "local::lib", diff --git a/db/schema.sql b/db/schema.sql index 5824b2d6d..e1205099d 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -194,7 +194,10 @@ create table problem ( -- logging sending failures (used by webservices) send_fail_count integer not null default 0, send_fail_reason text, - send_fail_timestamp timestamp + send_fail_timestamp timestamp, + + -- record send_method used, which can be used to infer usefulness of external_id + send_method_used text ); create index problem_state_latitude_longitude_idx on problem(state, latitude, longitude); create index problem_user_id_idx on problem ( user_id ); diff --git a/db/schema_0015-add_send_method_used_column_to_problem.sql b/db/schema_0015-add_send_method_used_column_to_problem.sql new file mode 100644 index 000000000..0c6e0851d --- /dev/null +++ b/db/schema_0015-add_send_method_used_column_to_problem.sql @@ -0,0 +1,6 @@ +begin; + +ALTER table problem + ADD column send_method_used text; + +commit; diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index acdaf7c04..198acade6 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -483,6 +483,10 @@ sub search_reports : Path('search_reports') { $query = [ 'me.id' => int($1), ]; + } elsif ($search =~ /^area:(\d+)$/) { + $query = [ + 'me.areas' => { like => "%,$1,%" } + ]; } else { $query = [ 'me.id' => $search_n, @@ -523,6 +527,8 @@ sub search_reports : Path('search_reports') { 'problem.id' => int($1), %{ $site_restriction }, ]; + } elsif ($search =~ /^area:(\d+)$/) { + $query = []; } else { $query = [ 'me.id' => $search_n, @@ -534,18 +540,20 @@ sub search_reports : Path('search_reports') { %{ $site_restriction }, ]; } - my $updates = $c->model('DB::Comment')->search( - { - -or => $query, - }, - { - -select => [ 'me.*', qw/problem.council problem.state/ ], - prefetch => [qw/user problem/], - order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created'] - } - ); - $c->stash->{updates} = [ $updates->all ]; + if (@$query) { + my $updates = $c->model('DB::Comment')->search( + { + -or => $query, + }, + { + -select => [ 'me.*', qw/problem.council problem.state/ ], + prefetch => [qw/user problem/], + order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created'] + } + ); + $c->stash->{updates} = [ $updates->all ]; + } # Switch quoting back off. See above for explanation of this. $c->model('DB')->schema->storage->sql_maker->quote_char( '' ); diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index c54bad238..5d5832b08 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -114,6 +114,7 @@ sub _shrink { $image->BlobToImage($photo); my $err = $image->Scale(geometry => "$size>"); throw Error::Simple("resize failed: $err") if "$err"; + $image->Strip(); my @blobs = $image->ImageToBlob(); undef $image; return $blobs[0]; @@ -129,6 +130,7 @@ sub _crop { throw Error::Simple("resize failed: $err") if "$err"; $err = $image->Extent( geometry => '90x60', gravity => 'Center' ); throw Error::Simple("resize failed: $err") if "$err"; + $image->Strip(); my @blobs = $image->ImageToBlob(); undef $image; return $blobs[0]; diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 4b738b66c..192e539bd 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -85,11 +85,13 @@ __PACKAGE__->add_columns( "geocode", { data_type => "bytea", is_nullable => 1 }, "send_fail_count", - { data_type => "integer", is_nullable => 1 }, + { data_type => "integer", default_value => 0, is_nullable => 0 }, "send_fail_reason", { data_type => "text", is_nullable => 1 }, "send_fail_timestamp", { data_type => "timestamp", is_nullable => 1 }, + "send_method_used", + { data_type => "text", is_nullable => 1 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->has_many( @@ -112,8 +114,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-16 10:08:56 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VODeZlWk8l/+IzBBlRNV0A +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-05-03 16:05:20 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EvwI91Ot7SioQWqwnXRTBQ # Add fake relationship to stored procedure table __PACKAGE__->has_one( @@ -568,11 +570,25 @@ sub body { return $body; } +# returns true if the external id is the council's ref, i.e., useful to publish it +# (by way of an example, the barnet send method returns a useful reference when +# it succeeds, so that is the ref we should show on the problem report page). +# Future: this is installation-dependent so maybe should be using the contact +# data to determine if the external id is public on a council-by-council basis. +# Note: this only makes sense when called on a problem that has been sent! +sub can_display_external_id { + my $self = shift; + if ($self->external_id && $self->send_method_used eq 'barnet') { + return 1; + } + return 0; +} + # TODO Some/much of this could be moved to the template # either: # "sent to council 3 mins later" -# "council ref: XYZ" +# "[Council name] ref: XYZ" # or # "sent to council 3 mins later, their ref: XYZ" # @@ -584,7 +600,7 @@ sub processed_summary_string { if ($problem->whensent) { $duration_clause = $problem->duration_string($c) } - if ($problem->external_id) { + if ($problem->can_display_external_id) { if ($duration_clause) { $external_ref_clause = sprintf(_('their ref: %s'), $problem->external_id); } else { diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index a8cbc98f2..7daf01f56 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -151,7 +151,7 @@ sub delete_user { ok( $p->delete, "delete problem " . $p->title ); } for my $a ( $user->alerts ) { - $a->alert_sents->delete; + $a->alerts_sent->delete; ok( $a->delete, "delete alert " . $a->alert_type ); } ok( $_->delete, "delete comment " . $_->text ) for $user->comments; diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t index 5ea73625a..3a4c2ef81 100644 --- a/t/app/controller/alert_new.t +++ b/t/app/controller/alert_new.t @@ -452,7 +452,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub { $count++ if $_->body =~ /The following updates have been left on this problem:/; $count++ if $_->body =~ /The following new problems have been reported to City of\s*Edinburgh Council:/; $count++ if $_->body =~ /The following nearby problems have been added:/; - $count++ if $_->body =~ / -\s+Testing, EH1 1BB/; + $count++ if $_->body =~ /\s+-\s+Testing,\s+EH1\s+1BB/; } is $count, 5, 'Five emails with the right things in them'; diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t index ab129b4e7..67ddc10aa 100644 --- a/t/app/model/alert_type.t +++ b/t/app/model/alert_type.t @@ -202,7 +202,7 @@ for my $test ( (my $title = $report->title) =~ s/ /\\s+/; my $body = $email->body; - like $body, qr#report/$report_id - $title, $pc#, 'email contains expected postcode'; + like $body, qr#report/$report_id\s+-\s+$title,\s+$pc#, 'email contains expected postcode'; }; } diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html index acfec3ed4..da7223aa6 100644 --- a/templates/web/default/admin/council_contacts.html +++ b/templates/web/default/admin/council_contacts.html @@ -10,7 +10,11 @@ [% IF example_pc %] <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> | [% END %] +[% IF c.cobrand.moniker == 'emptyhomes' %] +<a href="[% c.uri_for( 'search_reports', search => 'area:' _ area_id ) %]">[% loc('List all reported problems' ) %]</a> +[% ELSE %] <a href="[% c.uri_for_email( '/reports/' _ area_id ) %]">[% loc('List all reported problems' ) %]</a> +[% END %] <a href="[% c.uri_for( 'council_contacts', area_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html index 98723e6ef..18c964dfe 100644 --- a/templates/web/default/admin/search_users.html +++ b/templates/web/default/admin/search_users.html @@ -18,7 +18,7 @@ [%- FOREACH user IN users %] <tr> <td>[% PROCESS value_or_nbsp value=user.name %]</td> - <td><a href="[% c.uri_for( 'search_reports', user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> + <td><a href="[% c.uri_for( 'search_reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> <td>[% user.flagged ? loc('Yes') : ' ' %]</td> <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td> diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html index 70a0ed41c..718d10d56 100644 --- a/templates/web/default/js/validation_strings.html +++ b/templates/web/default/js/validation_strings.html @@ -1,18 +1,18 @@ validation_strings = { - update: '[% loc('Please enter a message') %]', - title: '[% loc('Please enter a subject') %]', - detail: '[% loc('Please enter some details') %]', + update: '[% loc('Please enter a message') | replace("'", "\\'") %]', + title: '[% loc('Please enter a subject') | replace("'", "\\'") %]', + detail: '[% loc('Please enter some details') | replace("'", "\\'") %]', name: { - required: '[% loc('Please enter your name') %]', - validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]' + required: '[% loc('Please enter your name') | replace("'", "\\'") %]', + validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]' }, - category: '[% loc('Please choose a category') %]', + category: '[% loc('Please choose a category') | replace("'", "\\'") %]', rznvy: { - required: '[% loc('Please enter your email') %]', - email: '[% loc('Please enter a valid email') %]' + required: '[% loc('Please enter your email') | replace("'", "\\'") %]', + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' }, email: { - required: '[% loc('Please enter your email') %]', - email: '[% loc('Please enter a valid email') %]' + required: '[% loc('Please enter your email') | replace("'", "\\'") %]', + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' } }; diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html index 552be17e6..3a9e60e7b 100644 --- a/templates/web/default/report/_main.html +++ b/templates/web/default/report/_main.html @@ -2,12 +2,11 @@ <p><em>[% problem.meta_line(c) | html %] [% IF problem.council %] - [% IF problem.whensent || problem.external_id %] + [% IF problem.whensent || problem.can_display_external_id %] <small class="council_sent_info"><br> [% problem.processed_summary_string(c) %] </small> - [% END %] - + [% END %] [% ELSE %] <br><small>[% loc('Not reported to council') %]</small> [% END %] diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 4c1fd9968..baec00b57 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -13,14 +13,14 @@ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> <![endif]--> <script src="[% version('/js/modernizr.custom.76759.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] - <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html index 3b23c81cd..ded95df04 100644 --- a/templates/web/fixmystreet/questionnaire/index.html +++ b/templates/web/fixmystreet/questionnaire/index.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; INCLUDE 'header.html', title = loc('Questionnaire'), bodyclass = 'mappage' %] diff --git a/templates/web/fixmystreet/report/_main.html b/templates/web/fixmystreet/report/_main.html index 762aa10f7..7ceb1f6a5 100644 --- a/templates/web/fixmystreet/report/_main.html +++ b/templates/web/fixmystreet/report/_main.html @@ -4,8 +4,10 @@ <p><em> [% problem.meta_line(c) | html %] [% IF problem.council %] - [% IF problem.whensent %] - <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small> + [% IF problem.whensent || problem.can_display_external_id %] + <small class="council_sent_info"><br> + [% problem.processed_summary_string(c) %] + </small> [% END %] [% ELSE %] <br><small>[% loc('Not reported to council') %]</small> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 784c92a48..deca99f2c 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); diff --git a/templates/web/fixmystreet/report/photo-js.html b/templates/web/fixmystreet/report/photo-js.html new file mode 100644 index 000000000..df0e2f92d --- /dev/null +++ b/templates/web/fixmystreet/report/photo-js.html @@ -0,0 +1,8 @@ +[% IF c.cobrand.allow_photo_display %] + [% extra_css = BLOCK %] + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + [% END %] + [% extra_js = BLOCK %] + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% END %] +[% END %] diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html index 17480f68b..933afe1e5 100755 --- a/templates/web/fixmystreet/static/privacy.html +++ b/templates/web/fixmystreet/static/privacy.html @@ -3,9 +3,9 @@ <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><a href="#faq">Frequently Asked Questions</a></li> - <li><a href="#practical">Practical Questions</a></li> - <li><a href="#organisation">Organisation Questions</a></li> + <li><a href="/faq#faq">Frequently Asked Questions</a></li> + <li><a href="/faq#practical">Practical Questions</a></li> + <li><a href="/faq#organisation">Organisation Questions</a></li> <li><strong>Privacy and cookies</strong></li> </ul> </aside> diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index 4202564f7..3969bfde4 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -1,7 +1,7 @@ /* HEADINGS and TYPOGRAPHY */ body { - font-family: 'MuseoSans', 'Helvetica', 'Arial', sans-serif; + font-family: MuseoSans, Helmet, Freesans, sans-serif; margin:0; font-size:1em; line-height:1.5; @@ -17,14 +17,14 @@ p { } small{ - font-family: 'helvetica', 'arial',sans-serif; + font-family: Helmet, Freesans, sans-serif; font-style: italic; font-size: 0.8125em; line-height: 1.2307em; } h1 { - font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif; + font-family: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; font-size: 2em; line-height: 1em; font-weight: normal; @@ -43,7 +43,7 @@ h1#reports_heading a { } h2 { - font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif; + font-family:'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; font-size: 1.5em; /*24px*/ line-height: 1.3333em; /*32px*/ font-weight: normal; @@ -56,12 +56,12 @@ h3 { line-height: 1.20em; margin-top: 1.2em; margin-bottom: 0.8em; - font-weight: bold + font-weight: normal; } h4 { font-size: 1em; - font-weight: bold; + font-weight: normal; margin-bottom: 1em; } @@ -105,7 +105,7 @@ ol.big-numbers { color:#ccc; line-height:1; font: { - family: 'helvetica', 'arial', sans-serif; + family: Helmet, Freesans, sans-serif; weight:bold; size:2.5em; } @@ -149,6 +149,7 @@ img { select, input, textarea { font-size: 99%; + width: 100%; max-width: 95%; } @@ -177,14 +178,14 @@ a:visited { margin-bottom: 0px; } .meta-2{ - font-family: 'helvetica', 'arial',sans-serif; + font-family: Helmet, Freesans, sans-serif; color:#666666; font-style: italic; font-size: 0.75em; } h4.static{ - font-family: 'helvetica', 'arial',sans-serif; + font-family: Helmet, Freesans, sans-serif; text-transform: uppercase; font-size: 0.875em; line-height: 1.71428em; @@ -256,7 +257,7 @@ textarea { display: block; font-size: 1em; line-height: 1.5em; - font-family: 'helvetica', 'arial', sans-serif; + font-family: Helmet, Freesans, sans-serif; min-height:8em; } @@ -402,7 +403,7 @@ p.label-valid { width: 175px; height: 40px; top: 0.4em; - background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat; + background: url('data:image/png;base64,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') no-repeat; text-indent: -999999px; position: absolute; z-index:2; @@ -410,11 +411,15 @@ p.label-valid { .ie6 #site-logo { background: url('/cobrands/fixmystreet/images/ie_logo.gif') 0 -5px no-repeat; } +.ie7 #site-logo { + background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat; +} + // this is a skip to nav for mobile users only #nav-link { width: 50px; height: 48px; - background: url('/cobrands/fixmystreet/images/sprite.png') -5px -916px no-repeat; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAwCAMAAABkKdmIAAAACW9GRnMAAAAFAAADlACdjNY6AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAABEVBMVEUAAAAiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJAAAAABPQAAAAAAlHgBnVAAAAACSdwAAAAAAAAAaFQAAAAAAAAAAAAAAAACRdgCqigAAAAAAAABHOgDCnwAAAACriwCAaAApIQDOqABIOwCgggBqVwB8ZQDVrgCwkADjuQCafgDftgDetQCqigDrwADHogDGoQDFoAD1yADzxgDyxQDwxAD/0AD///+ZbHkYAAAAWXRSTlMAAAECAwQFBgkLDA0OEBESExQVFxgeHyEkJSkqMTI2Oj0/Q0RHSEpOT1FSVVtmZmxsdX6Kj5ebnp+goaenqKmru7y9vsTY3uPk5OTl5+zs7e7x9PX3+Pr7/fI8qpUAAAABYktHRFoDu6WiAAABMklEQVRIx+3T2VLCMBSA4ZjU1hhpUKgWlaq0VSuutYg7IJuIogKKvv+LSM2AelNOuHCGGf77b7KcBKGwT2AzYej/CIYSPCBEhRKVCILVBJQkVCwIS0NJmglCYhkoycSIINyBEocPiAsl7ljkeypTMhHko9tpD+t0QavUSjcX+bDzy9vSPYj0zg523LDtvaNCD3aWh11ziXMeT64fP0OPX1xbmCVEXdyqwm/sNEWJMr96LXHJb4fLczR1IjWXx83kyv6r3CiLG05VdvpXd9IP5n36XyaStGCiNSS6XYaRsq0LgpnlNyGi6VsMC6IZXlAfLeqBZ2iCIELNbFBpvLQjempUgqxJxb76KdT0/Fw+spzvmVRB6McYlu24ETm2ZfwW/b1pTOeR6Uwj6E8YkxFhjMbuC8zPYpEN6mT7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwHHW0eAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMG0oDMQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC') no-repeat; display: block; text-indent: -999999px; position: absolute; @@ -449,9 +454,8 @@ p.label-valid { a { background:$primary; &#mysoc-logo { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAACW9GRnMAAADwAAAAJgAMZizzAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAANlBMVEUAAAAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL///90WH2CAAAAEHRSTlMADx8vP09fb3+Pn6+/z9/v+t8hjgAAAAFiS0dEEeK1PboAAAGqSURBVFjD7ZbNjtwgEAY/oIE2YKj3f9ocPDOZ3eN6FCUKdWsJQ+H+saXNZrPZbDabzf/GovwdIhH8LUzHn/PqI32Jcw1v0fjidQf30EZPqmMURXeT5F5kbYwqSQbeWpAU6xg961pT+mgm+WR4Ke6SzG9JwQRWB6iaTClCzQBLknT0AibZAnCBSx2ALACGQ5JOznsmq1TA82LKIalC6Jwh5seaMGdUWKxiJQpclWVqLNlJsxThUIB6z8Qft3FQgEODrs4qUuj9qoljpAr2euKkmxVIjzrpTBUI90xMGgzJQGrMAEUGrGKQn6c7/HbngT1MMqRO1wdNDA6WpNgW5Ld38s1kuLt7fPbO5Lg7Z76ZaLJoV3WAa6wsxbmiyrMMruyMVxc3SaqvAv+YSQWS1Fs9oAi8jQKmsGB4zwJXgdO9VWnAkaUAHJ81CTAkLYAm5ZbB/QhSmm9d7Ff7Splr5jaI90zMgpQsScHsGmRFUsheH6O1jecR5m5BZlFSzF5NkpJ7lMJ85etDlPWjHdMJ6aMiFdYPdgzw6Q90Yvwo2+fM+3dps9lsNpvNP8gvi7UYry9B6TcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDAcdbR4AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwbSgMxAAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAASUVORK5CYII='); background-repeat:no-repeat; - background-position:-240px -38px; text-indent:-999999px; } } @@ -462,6 +466,10 @@ p.label-valid { .ie6 #main-nav ul#mysoc-menu li a#mysoc-logo { background: url('/cobrands/fixmystreet/images/ie_mysoc_logo.gif') center no-repeat; } +.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { + background: url('/cobrands/fixmystreet/images/sprite.png') -240px -38px no-repeat; +} + //defines where the table caption is (login stuff on mob, nav menu on desktop) .wrapper { width:100%; @@ -514,7 +522,7 @@ p.label-valid { text-transform:uppercase; font: { size:0.6875em; - family: 'helvetica', 'arial', sans-serif; + family: Helmet, Freesans, sans-serif; } &:hover, &.hover, &.active { text-decoration:none; @@ -1356,7 +1364,7 @@ table.nicetable { h2 { font: { style:italic; - family: 'helvetica', 'arial', sans-serif; + family: Helmet, Freesans, sans-serif; size:1.1875em; } color:#4d4d4d; @@ -1366,7 +1374,7 @@ table.nicetable { padding:1em; color: $primary_text; background: $primary; - font-family: 'helvetica', 'arial', sans-serif; + font-family: Helmet, Freesans, sans-serif; label { margin:0; } @@ -1408,7 +1416,7 @@ table.nicetable { color:#C8C8C8; padding:0.5em; font: { - family: 'helvetica', 'arial', sans-serif; + family: Helmet, Freesans, sans-serif; size:0.8125em; } @include border-radius(0 0 0.25em 0.25em); @@ -1425,7 +1433,7 @@ table.nicetable { width:100%; color: $primary_text; background: $primary; - font-family: 'helvetica', 'arial', sans-serif; + font-family: Helmet, Freesans, sans-serif; div { display:table-cell; text-align:center; diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index 35bb115c1..b4c108ce9 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -176,7 +176,7 @@ h1 { &#mysoc-logo { width:84px; height:16px; - background-position:-260px -43px; + background-position: -20px -5px; opacity: 0.8; &:hover { opacity: 1; @@ -190,9 +190,9 @@ h1 { } } } - - - +.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { + background-position: -260px -43px; +} // .content Is the white box @@ -800,7 +800,7 @@ body.frontpage { top:3em; width: 300px; height: 60px; - background-position:-2px -108px; + background: url('/cobrands/fixmystreet/images/sprite.png') -2px -108px no-repeat; } #user-meta { z-index:10; diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss index f77152dd6..4c7bc5af8 100644 --- a/web/cobrands/fixmystreet/_mixins.scss +++ b/web/cobrands/fixmystreet/_mixins.scss @@ -3,7 +3,7 @@ cursor:pointer; font:{ size: 0.875em; - family: 'Helvetica', 'Arial', sans-serif; + family: Helmet, Freesans, sans-serif; weight:bold; } text-transform:uppercase; diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 55b006b42..21cc16cb4 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -8,70 +8,5 @@ @import "_colours"; @import "_mixins"; @import "compass"; - -/* HEADINGS and TYPOGRAPHY */ - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300-webfont.eot'); - src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300-webfont.woff') format('woff'), - url('fonts/MuseoSans_300-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300_Italic-webfont.eot'); - src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500-webfont.eot'); - src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500-webfont.woff') format('woff'), - url('fonts/MuseoSans_500-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500_Italic-webfont.eot'); - src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); - font-weight: bold; - font-style: italic; -} - -@font-face { - font-family: 'Museo300-display'; - src: url('fonts/Museo300-Regular-webfont.eot'); - src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/Museo300-Regular-webfont.woff') format('woff'), - url('fonts/Museo300-Regular-webfont.ttf') format('truetype'), - url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); - font-weight: normal; - font-style: normal; -} - - -/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the - * table caption *at all* if the header is set to a font-face :( */ -noindex:-o-prefocus, #site-header { - font-family: sans-serif; -} - @import "_base"; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 0db8334fb..f73290b7b 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -560,9 +560,11 @@ $.fn.drawer = function(id, ajax) { /* * Fancybox fullscreen images */ - $('a[rel=fancy]').fancybox({ - 'overlayColor': '#000000' - }); + if (typeof $.fancybox == 'function') { + $('a[rel=fancy]').fancybox({ + 'overlayColor': '#000000' + }); + } /* * heightfix the desktop .content div diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png Binary files differindex cfa2ba098..61c27b32a 100644 --- a/web/cobrands/fixmystreet/images/sprite.png +++ b/web/cobrands/fixmystreet/images/sprite.png diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index f9d5b3930..ff7080c11 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -1,3 +1,68 @@ +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_300-webfont.eot'); + src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_300-webfont.woff') format('woff'), + url('fonts/MuseoSans_300-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_300_Italic-webfont.eot'); + src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), + url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_500-webfont.eot'); + src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_500-webfont.woff') format('woff'), + url('fonts/MuseoSans_500-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_500_Italic-webfont.eot'); + src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), + url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); + font-weight: bold; + font-style: italic; +} + +@font-face { + font-family: 'Museo300-display'; + src: url('fonts/Museo300-Regular-webfont.eot'); + src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/Museo300-Regular-webfont.woff') format('woff'), + url('fonts/Museo300-Regular-webfont.ttf') format('truetype'), + url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); + font-weight: normal; + font-style: normal; +} + +/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the + * table caption *at all* if the header is set to a font-face :( */ +noindex:-o-prefocus, #site-header { + font-family: sans-serif; +} + +h3, h4 { + font-weight: bold; +} + @import "_colours"; @import "_layout"; |
