From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 May 2013 17:24:13 +0000 (+0200)
Subject: planet: Add proper tag search function.
X-Git-Url: http://git.ipfire.org/?p=people%2Fshoehn%2Fipfire.org.git;a=commitdiff_plain;h=8876f3df273f2cdde20fb9b3855a05bea0213466

planet: Add proper tag search function.
---

diff --git a/static/js/site.js b/static/js/site.js
index f8e535c..83c3bb3 100644
--- a/static/js/site.js
+++ b/static/js/site.js
@@ -48,7 +48,7 @@ if (/.*download-splash.*/i.test(window.location.href)) {
 
 $(".planet-search-autocomplete").typeahead({
 	source: function(query, process) {
-		$.get("http://planet.ipfire.org/api/search/autocomplete", { q: query }, function(data) {
+		$.get("/api/planet/search/autocomplete", { q: query }, function(data) {
 			if (data.query == query) {
 				process(data.results);
 			}
diff --git a/templates/admin-planet-compose.html b/templates/admin-planet-compose.html
index 04fe68c..edf8fab 100644
--- a/templates/admin-planet-compose.html
+++ b/templates/admin-planet-compose.html
@@ -1,41 +1,54 @@
 {% extends "admin-base.html" %}
 
-{% block bodyA %}
-	<div class="post">
-		<h3>{{ _("Compose new entry") }}</h3>
-		<form name="entry" method="post">
-			{% raw xsrf_form_html() %}
-			{% if entry.id %}
-				<input type="hidden" name="id" value="{{ entry.id }}">
-			{% end %}
-
-			<table>
-				<tr>
-					<td>{{ _("Title") }}</td>
-					<td><input type="text" name="title" value="{{ entry.title }}"
-						size="50" /></td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<textarea id="markdown" name="markdown" rows="20" cols="80">{{ entry.markdown }}</textarea>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<input type="button" onClick="preview()" value="{{ _("Preview") }}" />
-						<input type="submit" value="{{ _("Save") }}" />
-					</td>
-				</tr>
-			</table>
-		</form>
+{% block body %}
+	<div class="page-header">
+		<h2>{{ _("Compose new entry") }}</h2>
 	</div>
 
+	<form class="form-horizontal" action="" method="POST" name="entry">
+		{% raw xsrf_form_html() %}
+
+		{% if entry.id %}
+			<input type="hidden" name="id" value="{{ entry.id }}">
+		{% end %}
+
+		<div class="control-group">
+			<label class="control-label" for="inputTitle">{{ _("Title") }}</label>
+			<div class="controls">
+				<input class="input-block-level" type="text" name="title" id="inputTitle"
+					value="{{ entry.title }}" placeholder="{{ _("Title") }}">
+			</div>
+		</div>
+
+		<div class="control-group">
+			<div class="controls">
+				<textarea class="input-block-level" name="markdown" rows="12" id="inputMarkdown"
+					placeholder="{{ _("Content") }}">{{ entry.markdown }}</textarea>
+			</div>
+		</div>
+
+		<hr>
+
+		<div class="control-group">
+			<label class="control-label" for="inputTags">{{ _("Tags") }}</label>
+			<div class="controls">
+				<input class="input-block-level planet-search-autocomplete" type="text"
+					name="tags" id="inputTags" value="{{ " ".join(entry.tags) }}"
+					placeholder="{{ _("Tags") }}" autocomplete="off">
+			</div>
+		</div>
+		<div class="form-actions">
+			<button type="submit" class="btn btn-primary">{{ _("Save") }}</button>
+			<a class="btn" href="javascript:preview();">{{ _("Preview") }}</a>
+			<a class="btn" href="/planet">{{ _("Cancel") }}</a>
+		</div>
+	</form>
+
 	<div id="preview"></div>
 
 	<script type="text/javascript">
 		preview = function() {
-			$.postJSON("/api/planet/render", { text : $("#markdown").val() },
+			$.postJSON("/api/planet/render", { text : $("#inputMarkdown").val() },
 				function(data) {
 					$("#preview").html(data.html);
 				}
diff --git a/templates/planet/posting.html b/templates/planet/posting.html
index c4e9724..4d769e0 100644
--- a/templates/planet/posting.html
+++ b/templates/planet/posting.html
@@ -15,6 +15,12 @@
 		</div>
 
 		<p class="pull-right" style="clear: both;">
+			{% if entry.tags %}
+				{{ _("Tags") }}:
+				{% for tag in entry.tags %}
+					<a href="/search?q={{ tag }}">{{ tag }}</a>
+				{% end %} &bull;
+			{% end %}
 			{{ _("Posted by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.cn }}</a>
 			{{ _("on") }} {{ locale.format_date(entry.published, shorter=True) }}
 		</p>
diff --git a/webapp/__init__.py b/webapp/__init__.py
index d24fbd8..ea7a420 100644
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -129,7 +129,7 @@ class Application(tornado.web.Application):
 			(r"/year/(\d+)", PlanetYearHandler),
 
 			# API
-			(r"/api/search/autocomplete", PlanetAPISearchAutocomplete),
+			(r"/api/planet/search/autocomplete", PlanetAPISearchAutocomplete),
 
 			# RSS
 			(r"/rss", RSSPlanetAllHandler),
@@ -229,6 +229,7 @@ class Application(tornado.web.Application):
 			(r"/downloads", AdminDownloadsHandler),
 			(r"/downloads/mirrors", AdminDownloadsMirrorsHandler),
 			# API
+			(r"/api/planet/search/autocomplete", PlanetAPISearchAutocomplete),
 			(r"/api/planet/render", AdminApiPlanetRenderMarkupHandler)
 		] + static_handlers)
 
diff --git a/webapp/backend/planet.py b/webapp/backend/planet.py
index 3bc5f84..a1ea61e 100644
--- a/webapp/backend/planet.py
+++ b/webapp/backend/planet.py
@@ -11,7 +11,9 @@ from databases import Databases
 from misc import Singleton
 
 class PlanetEntry(object):
-	def __init__(self, entry=None):
+	def __init__(self, db, entry=None):
+		self.db = db
+
 		if entry:
 			self.__entry = entry
 		else:
@@ -19,6 +21,7 @@ class PlanetEntry(object):
 				"id" : None,
 				"title" : "",
 				"markdown" : "",
+				"tags" : [],
 			})
 
 	def set(self, key, val):
@@ -75,6 +78,31 @@ class PlanetEntry(object):
 	def author(self):
 		return Accounts().search(self.__entry.author_id)
 
+	# Tags
+
+	def get_tags(self):
+		if not hasattr(self, "__tags"):
+			res = self.db.query("SELECT tag FROM planet_tags \
+				WHERE post_id = %s ORDER BY tag", self.id)
+			self.__tags = []
+			for row in res:
+				self.__tags.append(row.tag)
+
+		return self.__tags
+
+	def set_tags(self, tags):
+		# Delete all existing tags.
+		self.db.execute("DELETE FROM planet_tags WHERE post_id = %s", self.id)
+
+		self.db.executemany("INSERT INTO planet_tags(post_id, tag) VALUES(%s, %s)",
+			((self.id, tag) for tag in tags))
+
+		# Update cache.
+		self.__tags = tags
+		self.__tags.sort()
+
+	tags = property(get_tags, set_tags)
+
 
 class Planet(object):
 	__metaclass__ = Singleton
@@ -101,12 +129,12 @@ class Planet(object):
 	def get_entry_by_slug(self, slug):
 		entry = self.db.get("SELECT * FROM planet WHERE slug = %s", slug)
 		if entry:
-			return PlanetEntry(entry)
+			return PlanetEntry(self.db, entry)
 
 	def get_entry_by_id(self, id):
 		entry = self.db.get("SELECT * FROM planet WHERE id = %s", id)
 		if entry:
-			return PlanetEntry(entry)
+			return PlanetEntry(self.db, entry)
 
 	def _limit_and_offset_query(self, limit=None, offset=None):
 		query = " "
@@ -127,7 +155,7 @@ class Planet(object):
 
 		entries = []
 		for entry in self.db.query(query):
-			entries.append(PlanetEntry(entry))
+			entries.append(PlanetEntry(self.db, entry))
 
 		return entries
 
@@ -140,13 +168,13 @@ class Planet(object):
 
 		entries = self.db.query(query)
 
-		return [PlanetEntry(e) for e in entries]
+		return [PlanetEntry(self.db, e) for e in entries]
 
 	def get_entries_by_year(self, year):
 		entries = self.db.query("SELECT * FROM planet \
 			WHERE YEAR(published) = %s ORDER BY published DESC", year)
 
-		return [PlanetEntry(e) for e in entries]
+		return [PlanetEntry(self.db, e) for e in entries]
 
 	def render(self, text, limit=0):
 		if limit and len(text) >= limit:
@@ -184,22 +212,21 @@ class Planet(object):
 		# Split tags.
 		tags = what.split()
 
-		query = "SELECT * FROM planet WHERE id IN ( \
-			SELECT DISTINCT post_id FROM planet_tags"
+		query = "SELECT planet.* FROM planet INNER JOIN ( \
+				SELECT post_id FROM planet_tags \
+				INNER JOIN planet ON planet_tags.post_id = planet.id \
+				WHERE %s GROUP BY post_id HAVING COUNT(post_id) = %%s \
+			) pt ON planet.id = pt.post_id ORDER BY published DESC"
 
-		clauses = []
-		args = []
+		args = (tags, len(tags))
 
+		clauses, args = [], tags
 		for tag in tags:
-			clauses.append("tag = %s")
-			args.append(tag)
-
-		query += " WHERE %s" % " OR ".join(clauses)
-		query += " ORDER BY COUNT(*) DESC)"
-
-		entries = self.db.query(query, *args)
+			clauses.append("planet_tags.tag = %s")
+		args.append(len(tags))
 
-		return [PlanetEntry(e) for e in entries]
+		entries = self.db.query(query % " OR ".join(clauses), *args)
+		return [PlanetEntry(self.db, e) for e in entries]
 
 	def search_autocomplete(self, what):
 		tags = what.split()
diff --git a/webapp/handlers_admin.py b/webapp/handlers_admin.py
index 7c4cb1a..c5ac794 100644
--- a/webapp/handlers_admin.py
+++ b/webapp/handlers_admin.py
@@ -76,7 +76,7 @@ class AdminPlanetHandler(AdminBaseHandler):
 class AdminPlanetComposeHandler(AdminBaseHandler):
 	@tornado.web.authenticated
 	def get(self, id=None):
-		entry = backend.PlanetEntry()
+		entry = backend.PlanetEntry(self.planet.db)
 
 		if id:
 			entry = self.planet.get_entry_by_id(id)
@@ -87,7 +87,7 @@ class AdminPlanetComposeHandler(AdminBaseHandler):
 	def post(self, id=None):
 		id = self.get_argument("id", id)
 
-		entry = backend.PlanetEntry()
+		entry = backend.PlanetEntry(self.planet.db)
 
 		if id:
 			entry = self.planet.get_entry_by_id(id)
@@ -96,6 +96,9 @@ class AdminPlanetComposeHandler(AdminBaseHandler):
 		entry.set("markdown", self.get_argument("markdown"))
 		entry.set("author_id", self.current_user)
 
+		tags = self.get_argument("tags", "")
+		entry.tags = tags.split()
+
 		if id:
 			self.planet.update_entry(entry)
 		else: