From 6560748025427a7bca6d074a4858a79a7e7ec48c Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Thu, 18 Nov 2021 15:20:00 +0100
Subject: Minor cleanup

---
 util/saved-queries.pl                           | 66 -------------------------
 util/updates/2021-01-21-update-saved-queries.pl | 66 +++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100755 util/saved-queries.pl
 create mode 100755 util/updates/2021-01-21-update-saved-queries.pl

(limited to 'util')

diff --git a/util/saved-queries.pl b/util/saved-queries.pl
deleted file mode 100755
index f93d4643..00000000
--- a/util/saved-queries.pl
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/perl
-
-# This script checks and updates all queries in the saved_queries table.
-
-use v5.24;
-use warnings;
-use Cwd 'abs_path';
-use TUWF;
-
-my $ROOT;
-BEGIN { ($ROOT = abs_path $0) =~ s{/util/saved-queries\.pl$}{}; }
-
-use lib $ROOT.'/lib';
-use VNDB::Config;
-
-TUWF::set %{ config->{tuwf} };
-
-require VNWeb::AdvSearch;
-
-
-my($total, $updated, $err) = (0,0,0);
-
-for my $r (tuwf->dbAlli('SELECT uid, qtype, name, query FROM saved_queries')->@*) {
-    $total++;
-    my $q = eval { tuwf->compile({advsearch => $r->{qtype}})->validate($r->{query})->data };
-    if(!$q) {
-        $err++;
-        warn "Invalid query: $r->{uid}, $r->{qtype}, \"$r->{name}\": $r->{query}\n";
-        next;
-    }
-
-    # The old filter->advsearch conversion had a bug that caused length filters to get AND'ed together, which doesn't make sense.
-    if($r->{qtype} eq 'v' && !$r->{name} && $q->{query}[0] eq 'and') {
-        my @lengths = grep ref $_ && $_->[0] eq 'length', $q->{query}->@*;
-        $q->{query} = [ grep(!ref $_ || $_->[0] ne 'length', $q->{query}->@*), [ 'or', @lengths ] ] if @lengths > 1;
-        warn "Converted 'AND length' to 'OR length' for $r->{uid}\n" if @lengths > 1;
-    }
-
-    # "Unlabeled && !Unlabeled" used to mean "on my list" and was what the old filter conversions used.
-    # That meaning has changed and we now have a better on-list filter.
-    if($r->{qtype} eq 'v' && $q->{query}[0] eq 'and') {
-        my sub isonlist {
-            my $q = $_;
-            ref $q && $q->[0] eq 'or' && @$q == 3
-                && $q->[1][0] eq 'label' && $q->[1][1] eq  '=' && ref $q->[1][2] && $q->[1][2][0] eq $r->{uid} && $q->[1][2][1] eq 0
-                && $q->[2][0] eq 'label' && $q->[2][1] eq '!=' && ref $q->[2][2] && $q->[2][2][0] eq $r->{uid} && $q->[2][2][1] eq 0
-        }
-        my $e=0;
-        $q->{query} = [ map isonlist($_) ? do { $e=1; [ 'on-list', '=', 1 ] } : $_, $q->{query}->@* ];
-        warn "Converted Unlabaled hack to on-list for $r->{uid}\n" if $e;
-    }
-
-    my $qs = $q->query_encode;
-    if(!$qs) {
-        warn "Empty query: $r->{uid}, $r->{qtype}, \"$r->{name}\": $r->{query}\n";
-        next;
-    }
-    if($qs ne $r->{query}) {
-        $updated++;
-        tuwf->dbExeci('UPDATE saved_queries SET query =', \$qs, 'WHERE', { uid => $r->{uid}, qtype => $r->{qtype}, name => $r->{name} });
-    }
-}
-
-tuwf->dbCommit;
-
-printf "Updated %d/%d saved queries, %d errors.\n", $updated, $total, $err;
diff --git a/util/updates/2021-01-21-update-saved-queries.pl b/util/updates/2021-01-21-update-saved-queries.pl
new file mode 100755
index 00000000..f93d4643
--- /dev/null
+++ b/util/updates/2021-01-21-update-saved-queries.pl
@@ -0,0 +1,66 @@
+#!/usr/bin/perl
+
+# This script checks and updates all queries in the saved_queries table.
+
+use v5.24;
+use warnings;
+use Cwd 'abs_path';
+use TUWF;
+
+my $ROOT;
+BEGIN { ($ROOT = abs_path $0) =~ s{/util/saved-queries\.pl$}{}; }
+
+use lib $ROOT.'/lib';
+use VNDB::Config;
+
+TUWF::set %{ config->{tuwf} };
+
+require VNWeb::AdvSearch;
+
+
+my($total, $updated, $err) = (0,0,0);
+
+for my $r (tuwf->dbAlli('SELECT uid, qtype, name, query FROM saved_queries')->@*) {
+    $total++;
+    my $q = eval { tuwf->compile({advsearch => $r->{qtype}})->validate($r->{query})->data };
+    if(!$q) {
+        $err++;
+        warn "Invalid query: $r->{uid}, $r->{qtype}, \"$r->{name}\": $r->{query}\n";
+        next;
+    }
+
+    # The old filter->advsearch conversion had a bug that caused length filters to get AND'ed together, which doesn't make sense.
+    if($r->{qtype} eq 'v' && !$r->{name} && $q->{query}[0] eq 'and') {
+        my @lengths = grep ref $_ && $_->[0] eq 'length', $q->{query}->@*;
+        $q->{query} = [ grep(!ref $_ || $_->[0] ne 'length', $q->{query}->@*), [ 'or', @lengths ] ] if @lengths > 1;
+        warn "Converted 'AND length' to 'OR length' for $r->{uid}\n" if @lengths > 1;
+    }
+
+    # "Unlabeled && !Unlabeled" used to mean "on my list" and was what the old filter conversions used.
+    # That meaning has changed and we now have a better on-list filter.
+    if($r->{qtype} eq 'v' && $q->{query}[0] eq 'and') {
+        my sub isonlist {
+            my $q = $_;
+            ref $q && $q->[0] eq 'or' && @$q == 3
+                && $q->[1][0] eq 'label' && $q->[1][1] eq  '=' && ref $q->[1][2] && $q->[1][2][0] eq $r->{uid} && $q->[1][2][1] eq 0
+                && $q->[2][0] eq 'label' && $q->[2][1] eq '!=' && ref $q->[2][2] && $q->[2][2][0] eq $r->{uid} && $q->[2][2][1] eq 0
+        }
+        my $e=0;
+        $q->{query} = [ map isonlist($_) ? do { $e=1; [ 'on-list', '=', 1 ] } : $_, $q->{query}->@* ];
+        warn "Converted Unlabaled hack to on-list for $r->{uid}\n" if $e;
+    }
+
+    my $qs = $q->query_encode;
+    if(!$qs) {
+        warn "Empty query: $r->{uid}, $r->{qtype}, \"$r->{name}\": $r->{query}\n";
+        next;
+    }
+    if($qs ne $r->{query}) {
+        $updated++;
+        tuwf->dbExeci('UPDATE saved_queries SET query =', \$qs, 'WHERE', { uid => $r->{uid}, qtype => $r->{qtype}, name => $r->{name} });
+    }
+}
+
+tuwf->dbCommit;
+
+printf "Updated %d/%d saved queries, %d errors.\n", $updated, $total, $err;
-- 
cgit v1.2.3