X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=216a9c1f47758aa7030541a8cb46db5642e2a861;hb=9044e2e062e6e4cfc750613588557606704cd649;hp=f542a390bf833fbfcaed6f4d6a002acbb7ae44ba;hpb=a4fd183b5853867a9293dba438512d8400e6b65e;p=tt-rss.git
diff --git a/update.php b/update.php
index f542a390..216a9c1f 100755
--- a/update.php
+++ b/update.php
@@ -33,6 +33,7 @@
"update-schema",
"convert-filters",
"force-update",
+ "gen-search-idx",
"list-plugins",
"help");
@@ -42,12 +43,19 @@
$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')) {
?>
Tiny Tiny RSS data update script.
-
+
@@ -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);
}
@@ -175,7 +185,9 @@
}
update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
- housekeeping_common(true);
+
+ if (!isset($options["pidlock"]) || $options["task"] == 0)
+ housekeeping_common(true);
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
@@ -320,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($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);
@@ -344,10 +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");
?>