From 45bba92c2606ec5506865f75835ad308409d4b68 Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sat, 5 Jun 2010 19:21:15 +0200
Subject: [PATCH] fix json loading

---
 lib/MojoFacets/Data.pm        | 3 +--
 lib/MojoFacets/Import/File.pm | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index b12025c..1a08e3c 100644
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -7,7 +7,6 @@ use base 'Mojolicious::Controller';
 
 use Data::Dump qw(dump);
 use File::Slurp;
-use JSON;
 use Encode;
 use locale;
 use File::Find;
@@ -175,7 +174,7 @@ sub _load_path {
 
 	my $data;
 	if ( -f $full_path ) {
-		$data = MojoFacets::Import::File->new( path => $full_path )->data;
+		$data = MojoFacets::Import::File->new( full_path => $full_path, path => $path )->data;
 	} elsif ( -d $full_path && $full_path =~ m/.html/ ) {
 		$data = MojoFacets::Import::HTMLTable->new( dir => $full_path )->data;
 	} else {
diff --git a/lib/MojoFacets/Import/File.pm b/lib/MojoFacets/Import/File.pm
index a53ee75..dac817b 100644
--- a/lib/MojoFacets/Import/File.pm
+++ b/lib/MojoFacets/Import/File.pm
@@ -8,6 +8,7 @@ use base 'Mojo::Base';
 use HTML::TableExtract;
 use File::Slurp;
 use Data::Dump qw(dump);
+use JSON;
 
 __PACKAGE__->attr('path');
 __PACKAGE__->attr('full_path');
@@ -19,7 +20,7 @@ sub data {
 
 	# we could use Mojo::JSON here, but it's too slow
 #	$data = from_json read_file $path;
-	my $data = read_file $self->path_path;
+	my $data = read_file $self->full_path;
 	warn "# data snippet: ", substr($data,0,200);
 	my @header;
 	if ( $path =~ m/\.js/ ) {
-- 
2.20.1