Skip to content

Fixed RT120946 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed RT120946 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a58403
Fixed RT120946
nigelhorne Apr 5, 2017
0a2fcc4
Fix RT 120973
nigelhorne Apr 5, 2017
50e8d83
Merge in upstream
nigelhorne Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Build.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ $class -> new
dist_author => 'Ron Savage <ron@savage.net.au>',
build_requires =>
{
'Test::More' => 0,
# 'Test::Pod' => 1.45, # Make it optional. See t/pod.t
'Test::More' => 1.001014,
'Test::Pod' => 1.48,
},
configure_requires =>
{
'Module::Build' => 0.3800,
'Module::Build' => 0.4211,
},
requires =>
{
Expand All @@ -51,9 +51,9 @@ $class -> new
},
resources =>
{
bugtracker => 'https://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Timeline',
license => 'http://opensource.org/licenses/Artistic-2.0',
repository => 'https://github.com/ronsavage/HTML-Timeline',
'bugtracker' => 'https://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Timeline',
'license' => 'http://opensource.org/licenses/Artistic-2.0',
'repository' => 'https://github.com/ronsavage/HTML-Timeline',
},
script_files => ['bin/timeline.pl'],
'script_files' => ['bin/timeline.pl'],
) -> create_build_script();
26 changes: 14 additions & 12 deletions MYMETA.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,36 @@
"Ron Savage <ron@savage.net.au>"
],
"dynamic_config" : 0,
"generated_by" : "Module::Build version 0.4211",
"generated_by" : "Module::Build version 0.4231",
"license" : [
"artistic_2"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
"version" : "2"
"version" : 2
},
"name" : "HTML-Timeline",
"prereqs" : {
"build" : {
"requires" : {
"Test::More" : "0"
"Test::More" : 1.001014,
"Test::Pod" : 1.48
}
},
"configure" : {
"requires" : {
"Module::Build" : "0.38"
"Module::Build" : 0.4211
}
},
"runtime" : {
"requires" : {
"Carp" : "0",
"Config::IniFiles" : "0",
"Gedcom" : "0",
"Gedcom::Date" : "0",
"HTML::Template" : "0",
"Path::Class" : "0",
"accessors" : "0"
"Carp" : 0,
"Config::IniFiles" : 0,
"Gedcom" : 0,
"Gedcom::Date" : 0,
"HTML::Template" : 0,
"Path::Class" : 0,
"accessors" : 0
}
}
},
Expand All @@ -48,5 +49,6 @@
"http://www.perlfoundation.org/artistic_license_2_0"
]
},
"version" : "1.08"
"version" : "1.08",
"x_serialization_backend" : "JSON::PP version 4.11"
}
14 changes: 7 additions & 7 deletions Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ my(%params) =
PL_FILES => {},
PREREQ_PM =>
{
accessors => 0,
Carp => 0,
Config::IniFiles => 0,
Gedcom => 0,
Gedcom::Date => 0,
HTML::Template => 0,
Path::Class => 0,
'accessors' => 0,
'Carp' => 0,
'Config::IniFiles' => 0,
'Gedcom' => 0,
'Gedcom::Date' => 0,
'HTML::Template' => 0,
'Path::Class' => 0,
},
VERSION_FROM => 'lib/HTML/Timeline.pm',
);
Expand Down
Empty file modified bin/timeline.pl
100644 → 100755
View file
Open in desktop
Empty file.
16 changes: 13 additions & 3 deletions lib/HTML/Timeline.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ template_dir
template_name
timeline_height
url_for_xml
validate
verbose
web_page
xml_file
Expand Down Expand Up @@ -256,7 +257,7 @@ sub generate_xml_file
$output_file_name = file($output_dir, $output_file_name);
}

open(my $fh, "> $output_file_name") || Carp::croak "Can't open(> $output_file_name): $!";
open($fh, '>', $output_file_name) || Carp::croak "Can't open(> $output_file_name): $!";
print $fh $template -> output();
close $fh;

Expand Down Expand Up @@ -321,6 +322,7 @@ template_dir
template_name
timeline_height
url_for_xml
validate
verbose
web_page
xml_file
Expand All @@ -342,6 +344,7 @@ xml_file
$self -> timeline_height(500);
$self -> url_for_xml('');
$self -> verbose(0);
$self -> validate(1);
$self -> web_page('timeline.html');
$self -> xml_file('timeline.xml');

Expand Down Expand Up @@ -403,7 +406,7 @@ xml_file
)
);

if (! $self -> gedobj() -> validate() )
if($arg{'options'}{'validate'} && (! $self -> gedobj() -> validate() ))
{
Carp::croak 'Cannot validate file: ' . $self -> gedcom_file();
}
Expand All @@ -430,7 +433,8 @@ sub run
$self -> log('Processing:');

my($root_person) = $self -> gedobj() -> get_individual($self -> root_person() );
my($name) = $self -> clean_persons_name($root_person -> name() );
my($name) = $self -> clean_persons_name($root_person -> name() );


my(@people);

Expand Down Expand Up @@ -573,6 +577,12 @@ If this option is used, HTML::Template will look for a file of this name.

If this option is not used, 'timeline.tmpl' will be used.

=item validate

If this option is used, HTML::Template will valide the Gedcom file.

The default value is 1.

=item url_for_xml a_url

If this option is used, it becomes the prefix of the name of the output XML file written into
Expand Down