Bladeren bron

fix build_index.pl, add some migration help

George S. Baugh 4 jaren geleden
bovenliggende
commit
f7b22b6635
3 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. 2 2
      lib/Trog/Data/FlatFile.pm
  2. 1 0
      lib/Trog/DataModule.pm
  3. 1 1
      lib/Trog/SQLite/TagIndex.pm

+ 2 - 2
lib/Trog/Data/FlatFile.pm

@@ -64,7 +64,7 @@ sub read ($self, $query={}) {
         }
 
         #XXX this imposes an inefficiency in itself, get() will filter uselessly again here
-        my @filtered = $self->filter($query,@$parsed);
+        my @filtered = $query->{raw} ? @$parsed : $self->filter($query,@$parsed);
 
         push(@items,@filtered) if @filtered;
         next if $query->{limit} == 0; # 0 = unlimited
@@ -75,7 +75,7 @@ sub read ($self, $query={}) {
 }
 
 sub _index ($self) {
-    confess "Can't find datastore!" unless -d $datastore;
+    confess "Can't find datastore in $datastore !" unless -d $datastore;
     opendir(my $dh, $datastore) or confess;
     my @index = grep { -f } map { "$datastore/$_" } readdir $dh;
     closedir $dh;

+ 1 - 0
lib/Trog/DataModule.pm

@@ -80,6 +80,7 @@ As implemented, this takes the data as a given and filters in post.
 sub get ($self, %request) {
 
     my $posts = $self->read(\%request);
+    return @$posts if $request{raw};
 
     my @filtered = $self->filter(\%request, @$posts);
     @filtered = $self->_fixup(@filtered);

+ 1 - 1
lib/Trog/SQLite/TagIndex.pm

@@ -66,7 +66,7 @@ sub build_index($data_obj,$posts=[]) {
 # It is important we use get() instead of read() because of incomplete data.
 sub build_routes($data_obj,$posts=[]) {
     my $dbh = _dbh();
-    $posts = $data_obj->get({ limit => 0, acls => ['admin'] }) unless @$posts;
+    @$posts = $data_obj->get( limit => 0, acls => ['admin'] ) unless @$posts;
 
     # Ensure the callbacks we need are installed
     Trog::SQLite::bulk_insert($dbh,'callbacks', [qw{callback}], 'IGNORE', (uniq map { $_->{callback} } @$posts) );