GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' of jill@xmpp001.controlezvous.ca:/opt/local/share/laconica into 0.8.x

This commit is contained in:
Evan Prodromou 2009-06-28 16:20:58 -04:00
parent 47e1d2adb8 a4d0f22b4b
commit 0c3bfc2212
3 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/commandline.inc
View File

@ -63,7 +63,14 @@ if (isset($longoptions)) {
$parser = new Console_Getopt(); $parser = new Console_Getopt();
list($options, $args) = $parser->getopt($argv, $shortoptions, $longoptions); $result = $parser->getopt($argv, $shortoptions, $longoptions);
if (PEAR::isError($result)) {
print $result->getMessage()."\n";
exit(1);
} else {
list($options, $args) = $result;
}
function show_help() function show_help()
{ {

31
scripts/fixup_conversations.php
View File

@ -24,22 +24,17 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
common_log(LOG_INFO, 'Fixing up conversations.'); common_log(LOG_INFO, 'Fixing up conversations.');
$notice = new Notice(); $nid = new Notice();
$notice->whereAdd('conversation is null'); $nid->query('select id, reply_to from notice where conversation is null');
$notice->orderBy('id');
$cnt = $notice->find(); while ($nid->fetch()) {
print "Found $cnt notices.\n"; $cid = null;
while ($notice->fetch()) { $notice = new Notice();
print "$notice->id =>"; if (empty($nid->reply_to)) {
$cid = $nid->id;
$orig = clone($notice);
if (empty($notice->reply_to)) {
$notice->conversation = $notice->id;
} else { } else {
$reply = Notice::staticGet('id', $notice->reply_to); $reply = Notice::staticGet('id', $notice->reply_to);
@ -52,6 +47,9 @@ while ($notice->fetch()) {
} else { } else {
$notice->conversation = $reply->conversation; $notice->conversation = $reply->conversation;
} }
unset($reply);
$reply = null;
} }
print "$notice->conversation"; print "$notice->conversation";
@ -63,5 +61,10 @@ while ($notice->fetch()) {
continue; continue;
} }
$notice = null;
$orig = null;
unset($notice);
unset($orig);
print ".\n"; print ".\n";
} }

19
scripts/twitterstatusfetcher.php
View File

@ -25,9 +25,14 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
define('MAXCHILDREN', 2); define('MAXCHILDREN', 2);
define('POLL_INTERVAL', 60); // in seconds define('POLL_INTERVAL', 60); // in seconds
$shortoptions = 'i::';
$longoptions = array('id::');
$helptext = <<<END_OF_TRIM_HELP $helptext = <<<END_OF_TRIM_HELP
Batch script for retrieving Twitter messages from foreign service. Batch script for retrieving Twitter messages from foreign service.
-i --id Identity (default 'generic')
END_OF_TRIM_HELP; END_OF_TRIM_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR.'/scripts/commandline.inc';
@ -64,7 +69,7 @@ class TwitterStatusFetcher extends Daemon
function name() function name()
{ {
return ('twitterstatusfetcher.generic'); return ('twitterstatusfetcher.'.$this->_id);
} }
/** /**
@ -625,6 +630,16 @@ class TwitterStatusFetcher extends Daemon
declare(ticks = 1); declare(ticks = 1);
$fetcher = new TwitterStatusFetcher(); if (have_option('i')) {
$id = get_option_value('i');
} else if (have_option('--id')) {
$id = get_option_value('--id');
} else if (count($args) > 0) {
$id = $args[0];
} else {
$id = null;
}
$fetcher = new TwitterStatusFetcher($id);
$fetcher->runOnce(); $fetcher->runOnce();