We now store the uri data in a separate table (#5560)

* We now have a item-uri table

* Fixing line endings

* New item uri table

* Rescued ItemURI.php file

* Reverting some git problem

* Corrected the dbstructure file

* Updated database.sql / we now store content in the new id fields
This commit is contained in:
Michael Vogel 2018-08-05 13:09:59 +02:00 committed by Tobias Diekershoff
parent ffe16be7d6
commit fa46e97f27
5 changed files with 103 additions and 5 deletions

View file

@ -17,6 +17,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\PermissionSet;
use Friendica\Model\ItemURI;
use Friendica\Object\Image;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
@ -1253,6 +1254,9 @@ class Item extends BaseObject
$item['guid'] = self::guid($item, $notify);
$item['uri'] = notags(trim(defaults($item, 'uri', self::newURI($item['uid'], $item['guid']))));
// Store URI data
$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
// Store conversation data
$item = Conversation::insert($item);
@ -1565,6 +1569,9 @@ class Item extends BaseObject
}
}
$item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
$item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
$condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?",
$item['uri'], $item['network'], NETWORK_DFRN, $item['uid']];
if (self::exists($condition)) {

56
src/Model/ItemURI.php Normal file
View file

@ -0,0 +1,56 @@
<?php
/**
* @file src/Model/ItemURI.php
*/
namespace Friendica\Model;
use Friendica\BaseObject;
use Friendica\Database\DBA;
require_once 'boot.php';
class ItemURI extends BaseObject
{
/**
* @brief Insert an item-uri record and return its id
*
* @param array $fields Item-uri fields
*
* @return integer item-uri id
*/
public static function insert($fields)
{
if (!DBA::exists('item-uri', ['uri' => $fields['uri']])) {
DBA::insert('item-uri', $fields, true);
}
$itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $fields['uri']]);
if (!DBA::isResult($itemuri)) {
// This shouldn't happen
return null;
}
return $itemuri['id'];
}
/**
* @brief Searched for an id of a given uri. Adds it, if not existing yet.
*
* @param string $uri
*
* @return integer item-uri id
*/
public static function getIdByURI($uri)
{
$itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $uri]);
if (!DBA::isResult($itemuri)) {
return self::insert(['uri' => $uri]);
}
return $itemuri['id'];
}
}