Changeset 16359

Timestamp:

05/09/08 18:59:44 (5 months ago)

Author:

rambo

Message:

forward port r16355 & 16358

Files:

• trunk/midcom/org.maemo.socialnews/config/config.inc (modified) (1 diff)
• trunk/midcom/org.maemo.socialnews/config/manifest.inc (modified) (1 diff)
• trunk/midcom/org.maemo.socialnews/documentation/CHANGES (modified) (1 diff)
• trunk/midcom/org.maemo.socialnews/handler/index.php (modified) (2 diffs)
• trunk/midcom/org.maemo.socialnews/locale/default.en.txt (modified) (2 diffs)
• trunk/midcom/org.maemo.socialnews/locale/default.fi.txt (modified) (3 diffs)

trunk/midcom/org.maemo.socialnews/config/config.inc

@@ -9 +9 @@
-'frontpage_show_main_items' => 3,
-'frontpage_show_abstract_length' => 1000,
+'frontpage_show_abstract_length_words' => 0,
+'frontpage_allowed_tags' => '<p><a><img><b><i><strong><pre><ul><li><br>',
-
-'frontpage_show_secondary_items' => 7,

trunk/midcom/org.maemo.socialnews/config/manifest.inc

@@ -1 +1 @@
-'name' => 'org.maemo.socialnews',
-'purecode' => false,
-0.1.0
+1.1.5
-'state' => 'beta',
-'privileges' => array(),

trunk/midcom/org.maemo.socialnews/documentation/CHANGES

@@ -7 +7 @@
-  which might even break existing functionality.
-- All items marked with "+" represent completely new features.
+
+2008-05-09 rambo
+  + svn merge -r 16354:16358 ../branch-28
+    (RSS feed for latest items, Add more intelligent word count truncater)
-
-2007-08-29 bergie

trunk/midcom/org.maemo.socialnews/handler/index.php

@@ -147 +147 @@
-    }
-
+    private function word_count_truncater(&$content, &$url)
+    {
+        // Normalize newlines to \n
+        $content = preg_replace("/\n\r|\r\n|\r/", "\n", $content);
+        $content = strip_tags($content, $this->_config->get('frontpage_allowed_tags'));
+
+        $word_limit = $this->_config->get('frontpage_show_abstract_length_words');
+        // Naive but works
+        $words = count(preg_split('/\b/', strip_tags($content)));
+        if ($words <= $word_limit)
+        {
+            return $content;
+        }
+
+        // The difficult part starts here
+        // In stead of trying parse the HTML tree to get N words while correctly closing all tags we get first paragraph
+
+        $content_matches = array();
+        if (preg_match("%((^\s+.*?)|(^.*?))(</p>|(\n\s*){2,}|(<br\s*/?>\s*){2,}|\w+\s*<p>)%ms", $content, $content_matches))
+        {
+            // We found usable "first paragraph", or so we think...
+            $first_paragraph =& $content_matches[1];
+
+        }
+        else if (strpos($content, "\n"))
+        {
+            //This post doesn't have sensible paragraphs, use raw substr from first newline...
+            $first_paragraph = substr($content, 0, strpos($content, "\n"));
+        }
+
+        if (isset($first_paragraph))
+        {
+            $first_paragraph_words = count(preg_split('/\b/', strip_tags($first_paragraph)));
+            // Check that our "first paragraph" is of sane size
+            if ($first_paragraph_words <= $word_limit)
+            {
+                $remaining_words = $words - $first_paragraph_words;
+                $ret = $first_paragraph;
+                if ($remaining_words < 1)
+                {
+                    return $ret;
+                }
+                $ret .= "<div class='entry-truncated'><a href='{$url}'>" . sprintf($this->_l10n->get('click to read %d more words'), $remaining_words) . "</a></div>\n";
+                return $ret;
+            }
+        }
+
+        // Fallback, show only "xxx words, click here to read"
+        $ret = "<div class='entry-truncated'><a href='{$url}'>" . sprintf($this->_l10n->get('click to read %d words'), $words) . "</a></div>\n";
+        return $ret;
+    }
+
-    private function generate_caption($data, $getCnt)
-    {
@@ -221 +273 @@
-            if (empty($article->abstract))
-            {
-
+
+
+
+
+
+
+
+
-            }
-            else
-            {
-
+
+
+
+
+
+
+
+
-            }
-

trunk/midcom/org.maemo.socialnews/locale/default.en.txt

@@ -20 +20 @@
----STRINGEND
-
+---STRING click to read %d more words
+Click to read %d more words
+---STRINGEND
+
----STRING item %s has been registered for score recalculation
-Item %s has been registered for score recalculation.
@@ -32 +36 @@
----STRINGEND
-
+---STRING click to read %d words
+Click to read %d words
+---STRINGEND
+

trunk/midcom/org.maemo.socialnews/locale/default.fi.txt

@@ -3 +3 @@
----CVS $Id$
----LANGUAGE fi
+
+---STRING %s to %s by %s with score %d
+%s kansioon %s, kirjoittanut %s %d pisteellÀ.
+---STRINGEND
-
----STRING %s to %s with score %d
@@ -14 +18 @@
----STRING best of %s
-%s:n parhaat
+---STRINGEND
+
+---STRING click to read %d more words
+Napsauta lukeaksesi %d sanaa lisÀÀ
----STRINGEND
-
@@ -28 +36 @@
----STRINGEND
-
-%s to %s by %s with score %d
-
+click to read %d words
+
----STRINGEND
-