add edit feed to feed header context menu in grouped mode

[tt-rss.git] / update.php
diff --git a/update.php b/update.php

index 08a872dc0bded0e85617661cb592c616a495d9be..0fa4db0d8a7bab5511cf9975f401f6d9e1b61ba5 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -33,6 +33,7 @@
                         "update-schema",
                         "convert-filters",
                         "force-update",
+                       "gen-search-idx",
                         "list-plugins",
                         "help");
  
@@ -42,6 +43,13 @@
  
         $options = getopt("", $longopts);
  
+       if (!is_array($options)) {
+               die("error: getopt() failed. ".
+                       "Most probably you are using PHP CGI to run this script ".
+                       "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+                       "additional information.\n");
+       }
+
         if (count($options) == 0 && !defined('STDIN')) {
                 ?> <html>
                 <head>
@@ -73,6 +81,7 @@
                 print "  --log FILE           - log messages to FILE\n";
                 print "  --indexes            - recreate missing schema indexes\n";
                 print "  --update-schema      - update database schema\n";
+               print "  --gen-search-idx     - generate basic PostgreSQL fulltext search index\n";
                 print "  --convert-filters    - convert type1 filters to type2\n";
                 print "  --force-update       - force update of all feeds\n";
                 print "  --list-plugins       - list all available plugins\n";
@@ -162,8 +171,9 @@
         if (isset($options["daemon"])) {
                 while (true) {
                         $quiet = (isset($options["quiet"])) ? "--quiet" : "";
+         $log = isset($options['log']) ? '--log '.$options['log'] : '';
  
-                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet");
+                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log");
                         _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
                         sleep(DAEMON_SLEEP_INTERVAL);
                 }
@@ -322,6 +332,37 @@
  
         }
  
+       if (isset($options["gen-search-idx"])) {
+               echo "Generating search index (stemming set to English)...\n";
+
+               $result = db_query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
+               $count = db_fetch_result($result, 0, "count");
+
+               print "Articles to process: $count.\n";
+
+               $limit = 500;
+               $processed = 0;
+
+               while (true) {
+                       $result = db_query("SELECT id, title, content FROM ttrss_entries WHERE tsvector_combined IS NULL ORDER BY id LIMIT $limit");
+
+                       while ($line = db_fetch_assoc($result)) {
+                          $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags(str_replace('<', ' <', $line['content'])),
+                                       0, 1000000));
+
+                               db_query("UPDATE ttrss_entries SET tsvector_combined = to_tsvector('english', '$tsvector_combined') WHERE id = " . $line["id"]);
+                       }
+
+                       $processed += db_num_rows($result);
+                       print "Processed $processed articles...\n";
+
+                       if (db_num_rows($result) != $limit) {
+                               echo "All done.\n";
+                               break;
+                       }
+               }
+       }
+
         if (isset($options["list-plugins"])) {
                 $tmppluginhost = new PluginHost();
                 $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
@@ -346,8 +387,6 @@
  
         PluginHost::getInstance()->run_commands($options);
  
-       if ($lock_handle != false) {
-               fclose($lock_handle);
-       }
-
+       if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+               unlink(LOCK_DIRECTORY . "/$lock_filename");
  ?>