Export all federation contacts through poco

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 7d6d015a3fe47d8dcb4b6943b2069fd6e415b64f..e14ce64d813cfead61dc73d427c7be1fe23b2440 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -646,6 +646,7 @@ function db_definition() {
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
                                        "nurl" => array("nurl"),
+                                       "updated" => array("updated"),
                                        )
                        );
        $database["glink"] = array(

diff --git a/include/socgraph.php b/include/socgraph.php
index 7d4cca18a96ac07656d15cbe856ab3932b06908e..1f3536a9f235d11b88df3d327352e806d56cf4ca 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -613,8 +613,8 @@ function poco_do_update($created, $updated, $last_failure,  $last_contact) {
                return false;
 
        // If the last contact was less than a week ago and the last failure is older than a week then don't update
-       if ((($now - $contact_time) < (60 * 60 * 24 * 7)) AND ($contact_time > $failure_time))
-               return false;
+       //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) AND ($contact_time > $failure_time))
+       //      return false;
 
        // If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
        if ((($now - $contact_time) > (60 * 60 * 24 * 7)) AND (($now - $created_time) > (60 * 60 * 24 * 7)) AND (($now - $failure_time) < (60 * 60 * 24 * 7)))

diff --git a/mod/poco.php b/mod/poco.php
index 0b08e30bf0b82442896c9ef7d7b913f41628e587..53c7f5b0b7c89bdf7992dcfa070775f799e8de7e 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -61,9 +61,12 @@ function poco_init(&$a) {
                $update_limit =  date("Y-m-d H:i:s",strtotime($_GET['updatedSince']));
 
        if ($global) {
-               $r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`))  AND `network` IN ('%s')",
+               //$r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`))  AND `network` IN ('%s')",
+               $r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure`  AND `network` IN ('%s', '%s', '%s')",
                        dbesc($update_limit),
-                       dbesc(NETWORK_DFRN)
+                       dbesc(NETWORK_DFRN),
+                       dbesc(NETWORK_DIASPORA),
+                       dbesc(NETWORK_OSTATUS)
                );
        } elseif($system_mode) {
                $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '')
@@ -96,9 +99,12 @@ function poco_init(&$a) {
 
 
        if ($global) {
-               $r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') AND ((`last_contact` >= `last_failure`) OR (`updated` > `last_failure`)) LIMIT %d, %d",
+               //$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') AND ((`last_contact` >= `last_failure`) OR (`updated` > `last_failure`)) LIMIT %d, %d",
+               $r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s', '%1', '%1') and `updated` > `last_failure` LIMIT %d, %d",
                        dbesc($update_limit),
                        dbesc(NETWORK_DFRN),
+                       dbesc(NETWORK_DIASPORA),
+                       dbesc(NETWORK_OSTATUS),
                        intval($startIndex),
                        intval($itemsPerPage)
                );