Changeset 22819

Timestamp:

09/09/10 10:28:40 (17 months ago)

Author:

alex

Message:

rewrote to reflect changes in ClassDescriptor? (extends => parents, parents => ancestors)

File:

• branches/mnw21/pathquery_refactor/intermine/perl/lib/IMUtils/UpdatePath.pm (modified) (19 diffs)

branches/mnw21/pathquery_refactor/intermine/perl/lib/IMUtils/UpdatePath.pm

@@ -9 +9 @@
 
     our @EXPORT= qw/changed dead update_path update_query check_class_name/;
-    
+
     my ($model, $changes, $log);
     our $prefix = 'org.intermine.model.bio.';
 
     sub set_up {
-    # args: model, changes, 
+    # args: model, changes,
     my $class = shift;
     my %args  = @_;
@@ -21 +21 @@
 
     # Read the details of the model changes from the .json config file
-    die 'No model change details supplied - please list a file with the --changesfile flag ' 
+    die 'No model change details supplied - please list a file with the --changesfile flag '
         unless $args{changes};
     open my $changesFH, '<', $args{changes} or die "Could not open $args{changes}, $!";
     my $content = join('', <$changesFH>);
     close $changesFH or die "could not close $args{changes}, $!";
-    
+
     # Decode it into a hash reference
     my $json  = new JSON;
@@ -37 +37 @@
     }
 
-    sub dead {    
+    sub dead {
     my $key = shift;
     $key =~ s/$prefix//;
@@ -49 +49 @@
 
     # otherwise you get @dbl_array[0,0], ie. doubling.
-    return @dbl_array if (@dbl_array == 1); 
+    return @dbl_array if (@dbl_array == 1);
 
     # find the length of the first array (ie. half the total)
-    my $midpoint = @dbl_array / 2;     
+    my $midpoint = @dbl_array / 2;
 
     # pair up the elements
-    return @dbl_array[ map { $_, $_ + $midpoint } 0 .. $midpoint - 1 ]; 
+    return @dbl_array[ map { $_, $_ + $midpoint } 0 .. $midpoint - 1 ];
     }
 
@@ -65 +65 @@
     return $class;
     }
-     
+
     my %processed;
-    
+
     sub update_path {
     my $path = shift;
@@ -80 +80 @@
         $prefixed++;          # but remember that we did so
     }
-    
+
     my $query = shift;
-    
+
     my $query_name = (ref $query) ? $query->get_name : $query;
-    
+
 
     my @new_bits;
@@ -92 +92 @@
 
     my $class_name = shift @bits;
-    
+
     my $class = check_class_name($class_name);
 
@@ -103 +103 @@
         }
         else {
-        $log->warning($query_name, qq{Unexpected deletion of class "$class_name"}) 
+        $log->warning($query_name, qq{Unexpected deletion of class "$class_name"})
             unless dead($class_name);
         return;
         }
     }
-    
+
     my $current_class = $class;
     my $current_field = undef;
-    
+
     my @path_so_far = ($class_name,);
       FIELD: for my $bit (@bits) {
@@ -117 +117 @@
       if ($bit eq 'id' and $bit eq $bits[-1]) { # id is an internal attribute for all tables
           push @new_bits, $bit;
-          $current_class = undef; # id must be the final attribute 
+          $current_class = undef; # id must be the final attribute
           # - this will catch it if it isn't
       }
@@ -132 +132 @@
           }
           }
-          if (not UNIVERSAL::can($current_class, 'isa') 
+          if (not UNIVERSAL::can($current_class, 'isa')
           or not $current_class->isa('InterMine::Model::ClassDescriptor')) {
           croak "Could not find class of $new_bits[-1] when searching for $bit in $path";
@@ -140 +140 @@
           }
           if (!defined $current_field) {
-          
+
           # Maybe this field is declared in a parent class?
-          my @parents = map {$_->name} $current_class->get_parents;
-
-          foreach my $parent (@parents) {
-              my $key = "$parent.$bit";
+          my @ancestors = map {$_->name} $current_class->get_ancestors;
+
+          foreach my $ancestor (@ancestors) {
+              my $key = "$ancestor.$bit";
               if (my $translation = changed($key)) {
               if ($current_field = $current_class->get_field_by_name($translation)){
@@ -151 +151 @@
                   push @new_bits, $translation;
                   push @path_so_far, $bit;
-                  
+
                   $current_class = next_class($current_field);
                   next FIELD;
               }
               }
-              
+
           }
           if (!defined $current_field) { # still!
@@ -198 +198 @@
     }
     }
-    
+
     sub update_query {
     my $query  = shift;
     my $origin = shift;
-    
+
     my ($is_broken, $is_changed);
 
@@ -209 +209 @@
     confess "$query is not a reference" unless (ref $query);
     $log->info('Processing', $query->{type}, '"'.$query->get_name. '"');
-    
+
     if ($query->type_hash) {
         while (my ($key, $path) = each %{$query->type_hash}) {
@@ -227 +227 @@
         }
         # to prevent undefined in string errors
-        $translation = '' unless $translation; 
+        $translation = '' unless $translation;
 
         $log->info(eval $change) unless ($path eq $translation);
@@ -247 +247 @@
     }
     $query->{view} = \@new_views;
-    
+
     if ($query->sort_order) {
         my ($sort_order, $direction) = split(/\s/, $query->sort_order);
@@ -262 +262 @@
             }
         }
-        $query->{sort_order} = $sort_order . 
+        $query->{sort_order} = $sort_order .
             (($direction) ? ' ' . $direction : '');
         }
@@ -293 +293 @@
         }
         else {
-        $log->info(eval $deletion, ' (with its '. 
+        $log->info(eval $deletion, ' (with its '.
                scalar(@{$query->{constraints}{$path}}).
                ' constraints)');
@@ -315 +315 @@
         $query->type_hash(\%new_typehash);
     }
-    
-    if ($is_broken) {   
+
+    if ($is_broken) {
         $log->warning($origin, $query->{type}, '"'.$query->get_name.'"', '"is broken');
     }