Merge branch 'beta'2.22

Conflicts:
	data/lang.txt

4 files changed, 20 insertions, 11 deletions

diff --git a/util/jsgen.pl b/util/jsgen.pl
index f046fe1a..26815423 100755
--- a/util/jsgen.pl
+++ b/util/jsgen.pl
@@ -111,6 +111,9 @@ sub jsgen {
   $common .= sprintf "animated = [ %s ];\n", join ', ', @{$S{animated}};
   $common .= sprintf "voiced = [ %s ];\n", join ', ', @{$S{voiced}};
   $common .= sprintf "vn_lengths = [ %s ];\n", join ', ', @{$S{vn_lengths}};
+  $common .= sprintf "blood_types = [ %s ];\n", join ', ', map qq{"$_"}, @{$S{blood_types}};
+  $common .= sprintf "genders = [ %s ];\n", join ', ', map qq{"$_"}, @{$S{genders}};
+  $common .= sprintf "char_roles = [ %s ];\n", join ', ', map qq{"$_"}, @{$S{char_roles}};
   $common .= sprintf "L10N_LANG = [ %s ];\n", join(', ', map
       sprintf('["%s","%s"]', $_, $lang{$_}{"_lang_$_"}||$lang{en}{"_lang_$_"}),
     VNDB::L10N::languages());
diff --git a/util/sql/all.sql b/util/sql/all.sql
index eac8d58a..bb5829f7 100644
--- a/util/sql/all.sql
+++ b/util/sql/all.sql
@@ -104,8 +104,7 @@ CREATE TRIGGER notify_dbedit              AFTER  UPDATE           ON chars
 CREATE TRIGGER notify_announce            AFTER  INSERT           ON threads_posts FOR EACH ROW WHEN (NEW.num = 1) EXECUTE PROCEDURE notify_announce();
 
 CREATE TRIGGER vn_vnsearch_notify AFTER UPDATE ON vn FOR EACH ROW
-  WHEN (OLD.c_search IS NOT NULL AND NEW.c_search IS NULL AND NOT NEW.hidden
-     OR NEW.hidden IS DISTINCT FROM OLD.hidden
+  WHEN (OLD.c_search IS NOT NULL AND NEW.c_search IS NULL
      OR NEW.latest IS DISTINCT FROM OLD.latest
   ) EXECUTE PROCEDURE vn_vnsearch_notify();
 CREATE TRIGGER vn_vnsearch_notify AFTER UPDATE ON releases FOR EACH ROW
diff --git a/util/sql/func.sql b/util/sql/func.sql
index 3af04562..e5be2fde 100644
--- a/util/sql/func.sql
+++ b/util/sql/func.sql
@@ -738,20 +738,16 @@ $$ LANGUAGE plpgsql;
 -- Check for updates to vn.c_search
 -- 1. NOTIFY is sent when vn.c_search goes from non-NULL to NULL
 -- vn.c_search is set to NULL when:
--- 2. UPDATE on VN with the hidden field going from TRUE to FALSE
--- 3. VN add/edit of which the title/original/alias fields differ from previous revision
--- 4. Release gets hidden or unhidden
--- 5. Release add/edit of which the title/original/vn fields differ from the previous revision
+-- 2. VN add/edit of which the title/original/alias fields differ from previous revision
+-- 3. Release gets hidden or unhidden
+-- 4. Release add/edit of which the title/original/vn fields differ from the previous revision
 CREATE OR REPLACE FUNCTION vn_vnsearch_notify() RETURNS trigger AS $$
 BEGIN
   IF TG_TABLE_NAME = 'vn' THEN
     -- 1.
-    IF NEW.c_search IS NULL AND NOT NEW.hidden THEN
+    IF NEW.c_search IS NULL THEN
       NOTIFY vnsearch;
     -- 2.
-    ELSIF NEW.hidden IS DISTINCT FROM OLD.hidden THEN
-      UPDATE vn SET c_search = NULL WHERE id = NEW.id;
-    -- 3.
     ELSIF NEW.latest IS DISTINCT FROM OLD.latest THEN
       IF EXISTS(SELECT 1 FROM vn_rev v1, vn_rev v2
         WHERE v1.id = OLD.latest AND v2.id = NEW.latest
@@ -761,7 +757,7 @@ BEGIN
       END IF;
     END IF;
   ELSIF TG_TABLE_NAME = 'releases' THEN
-    -- 4. & 5.
+    -- 3. & 4.
     IF NEW.hidden IS DISTINCT FROM OLD.hidden OR (
        NEW.latest IS DISTINCT FROM OLD.latest AND (
          EXISTS(
diff --git a/util/updates/update_2.22.sql b/util/updates/update_2.22.sql
new file mode 100644
index 00000000..3268481e
--- /dev/null
+++ b/util/updates/update_2.22.sql
@@ -0,0 +1,11 @@
+
+
+DROP TRIGGER vn_vnsearch_notify ON vn;
+
+CREATE TRIGGER vn_vnsearch_notify AFTER UPDATE ON vn FOR EACH ROW
+  WHEN (OLD.c_search IS NOT NULL AND NEW.c_search IS NULL
+     OR NEW.latest IS DISTINCT FROM OLD.latest
+  ) EXECUTE PROCEDURE vn_vnsearch_notify();
+
+\i util/sql/func.sql
+