remove hash from first column name

[MojoFacets.git] / lib / MojoFacets / Changes.pm

diff --git a/lib/MojoFacets/Changes.pm b/lib/MojoFacets/Changes.pm
index 90045ce..c1ddc04 100644 (file)
--- a/lib/MojoFacets/Changes.pm
+++ b/lib/MojoFacets/Changes.pm
@@ -12,7 +12,16 @@ use MojoFacets::Data;
 sub _changes_path {
        my $self = shift;
        my $path = $self->param('path') || $self->session('path');
-       $self->app->home->rel_dir('data') . '/' . $path . '.changes';
+       $self->app->home->rel_file('data') . '/' . $path . '.changes';
+}
+
+sub _hash_eq {
+       my ( $a_ref, $b_ref ) = @_;
+
+       warn "# _hash_eq ",dump($a_ref,$b_ref);
+
+       local $Storable::canonical = 1;
+       return eval { Storable::freeze( $a_ref ) } eq eval { Storable::freeze( $b_ref ) };
 }
 
 sub index {
@@ -20,13 +29,13 @@ sub index {
        my $path = $self->param('path') || $self->session('path');
        my $on_path = $self->param('on_path');
        my $commit = $self->param('commit');
+       my $apply = $self->param('apply');
        my ( $items, $unique2id );
        if ( $on_path ) {
                $items = $MojoFacets::Data::loaded->{$on_path}->{data}->{items};
                if ( ! $items ) {
                        warn "$on_path not loaded";
-                       $self->redirect_to('/data/index?path=' . $on_path);
-                       return;
+                       return $self->redirect_to('/data/index?path=' . $on_path);
                }
                warn "using ", $#$items + 1, " items from $on_path\n";
        }
@@ -54,12 +63,16 @@ sub index {
                        }
                        $status = 'missing';
                        if ( my $i = $unique2id->{$pk}->{$id} ) {
-                               $status = 'found';
-                               if ( $commit ) {
-                                       my $column = $e->{column} or die "no column";
-                                       $items->[$i]->{$column} = $e->{new};
-                                       warn "# commit $i $column ",dump( $e->{new} );
-                                       $invalidate_columns->{$column}++;
+                               if ( _hash_eq( $e->{old}, $items->[$i]->{$e->{column}} ) ) {
+                                       $status = 'found';
+                                       if ( $commit ) {
+                                               my $column = $e->{column} or die "no column";
+                                               $items->[$i]->{$column} = $e->{new};
+                                               warn "# commit $i $column ",dump( $e->{new} );
+                                               $invalidate_columns->{$column}++;
+                                       }
+                               } else {
+                                       $status = 'source-changed';
                                }
                        }
                } elsif ( my $code = $e->{code} ) {
@@ -77,6 +90,12 @@ sub index {
                                MojoFacets::Data::__path_rebuild_stats( $on_path );
                        }
                        $status = 'code';
+                       if ( ( $apply || $commit ) && $e->{commit_changed} ) {
+                               $status = 'found';
+                               foreach my $c ( keys %{ $e->{commit_changed} } ) {
+                                       $status = 'missing' unless defined $MojoFacets::Data::loaded->{$path}->{stats}->{$c};
+                               }
+                       }
                } else {
                        $status = 'unknown';
                }
@@ -112,7 +131,7 @@ sub remove {
                unlink $self->_changes_path . '/' . $t;
        }
 
-       $self->redirect_to('/changes');
+       return $self->redirect_to('/changes');
 }
 
 1;