From da2349bb6a85d13f0aa29046bef3021cf0c884ba Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Feb 2015 17:45:25 -0800 Subject: provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. --- mod/display.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mod/display.php') diff --git a/mod/display.php b/mod/display.php index 467c476da..c2e5c2426 100644 --- a/mod/display.php +++ b/mod/display.php @@ -231,10 +231,7 @@ function display_content(&$a, $update = 0, $load = false) { } if($updateable) { - $x = q("UPDATE item SET item_flags = ( item_flags & ~%d ) - WHERE (item_flags & %d)>0 AND uid = %d and parent = %d ", - intval(ITEM_UNSEEN), - intval(ITEM_UNSEEN), + $x = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d and parent = %d ", intval(local_channel()), intval($r[0]['parent']) ); -- cgit v1.2.3 From 2c7e8bea88abd4e835645996849e16ecd62dfa35 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 20 Feb 2015 14:07:56 +0100 Subject: show item title in channel/mid and display pages --- mod/display.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mod/display.php') diff --git a/mod/display.php b/mod/display.php index c2e5c2426..d06f1e66f 100644 --- a/mod/display.php +++ b/mod/display.php @@ -228,6 +228,9 @@ function display_content(&$a, $update = 0, $load = false) { $o .= conversation($a, $items, 'display', $update, 'client'); } else { $o .= conversation($a, $items, 'display', $update, 'traditional'); + if ($items[0]['title']) + $a->page['title'] = $items[0]['title'] . " - " . $a->page['title']; + } if($updateable) { -- cgit v1.2.3 From 48080d4103f19c6f2382be8f7ea66ca9b2f29d20 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 20 Feb 2015 14:11:28 +0100 Subject: correct indent --- mod/display.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/display.php') diff --git a/mod/display.php b/mod/display.php index d06f1e66f..d4a1acc5d 100644 --- a/mod/display.php +++ b/mod/display.php @@ -228,8 +228,8 @@ function display_content(&$a, $update = 0, $load = false) { $o .= conversation($a, $items, 'display', $update, 'client'); } else { $o .= conversation($a, $items, 'display', $update, 'traditional'); - if ($items[0]['title']) - $a->page['title'] = $items[0]['title'] . " - " . $a->page['title']; + if ($items[0]['title']) + $a->page['title'] = $items[0]['title'] . " - " . $a->page['title']; } -- cgit v1.2.3 From a2e3ca6fd8ba8c0630de089d772fdd668b84428b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 21 Mar 2015 16:46:28 -0700 Subject: add loadtime search to channel and fix it for home. display and search need further investigation --- mod/display.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mod/display.php') diff --git a/mod/display.php b/mod/display.php index d4a1acc5d..b5daea2de 100644 --- a/mod/display.php +++ b/mod/display.php @@ -5,6 +5,10 @@ function display_content(&$a, $update = 0, $load = false) { // logger("mod-display: update = $update load = $load"); + if($load) + $_SESSION['loadtime'] = datetime_convert(); + + if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { notice( t('Public access denied.') . EOL); return; @@ -105,6 +109,15 @@ function display_content(&$a, $update = 0, $load = false) { } + $simple_update = (($update) ? " AND item_unseen = 1 " : ''); + + if($update && $_SESSION['loadtime']) + $simple_update .= " and item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' "; + if($load) + $simple_update = ''; + + + if((! $update) && (! $load)) { -- cgit v1.2.3