1 files changed, 10 insertions, 196 deletions

diff --git a/etherpad/src/plugins/twitterStyleTags/controllers/tagBrowser.js b/etherpad/src/plugins/twitterStyleTags/controllers/tagBrowser.js
index 7071306..f0b7470 100644
--- a/etherpad/src/plugins/twitterStyleTags/controllers/tagBrowser.js
+++ b/etherpad/src/plugins/twitterStyleTags/controllers/tagBrowser.js
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import("plugins.twitterStyleTags.models.tagQuery");
+
 import("faststatic");
 import("dispatch.{Dispatcher,PrefixMatcher,forward}");
 
@@ -31,206 +33,19 @@ import("sqlbase.sqlcommon");
 import("sqlbase.sqlobj");
 import("etherpad.pad.padutils");
 
-function tagsToQuery(tags, antiTags) {
- var prefixed = [];
- for (i = 0; i < antiTags.length; i++)
-  prefixed[i] = '!' + antiTags[i];
- return tags.concat(prefixed).join(',');
-}
-
-function stringFormat(text, obj) {
-  var name;
-  for (name in obj) {
-    //iterate through the params and replace their placeholders from the original text
-    text = text.replace(new RegExp('%\\(' + name + '\\)s', 'gi' ), obj[name]);
-  }
-  return text;
-}
-
-/* All these sql query functions both takes a querySql object as
- * parameter and returns one. This object has two members - sql and
- * params. Sql is a string of an sql table name or a subqyery in
- * parens. The table pr subquery should have an ID column containing a
- * PAD_ID.
- */
-
-/* Filters pads by tags and anti-tags */
-function getQueryToSql(tags, antiTags, querySql) {
-  var queryTable;
-  var queryParams;
-
-  if (querySql == null) {
-    queryTable = 'PAD_META';
-    queryParams = [];
-  } else {
-    queryTable = querySql.sql;
-    queryParams = querySql.params;
-  }
-
-  var exceptArray = [];
-  var joinArray = [];
-  var whereArray = [];
-  var exceptParamArray = [];
-  var joinParamArray = [];
-
-  var info = new Object();
-  info.queryTable = queryTable;
-  info.n = 0;
-  var i;
-
-  for (i = 0; i < antiTags.length; i++) {
-    tag = antiTags[i];
-    exceptArray.push(
-     stringFormat(
-      'left join (PAD_TAG as pt%(n)s ' +
-      '	      join TAG AS t%(n)s on ' +
-      '	       t%(n)s.NAME = ? ' +
-      '	       and t%(n)s.ID = pt%(n)s.TAG_ID) on ' +
-      ' pt%(n)s.PAD_ID = p.ID ',
-      info));
-    whereArray.push(stringFormat('pt%(n)s.TAG_ID is null', info));
-    exceptParamArray.push(tag);
-    info.n += 1;
-  }
-  for (i = 0; i < tags.length; i++) {
-    tag = tags[i];
-    joinArray.push(
-     stringFormat(
-      'join PAD_TAG as pt%(n)s on ' +
-      ' pt%(n)s.PAD_ID = p.ID ' +
-      'join TAG as t%(n)s on ' +
-      ' t%(n)s.ID = pt%(n)s.TAG_ID ' +
-      ' and t%(n)s.NAME = ? ',
-      info));
-    joinParamArray.push(tag);
-    info.n += 1;
-  }
-
-  info["joins"] = joinArray.join(' ');
-  info["excepts"] = exceptArray.join(' ');
-  info["wheres"] = whereArray.length > 0 ? ' where ' + whereArray.join(' and ') : '';
- 
-  /* Create a subselect from all the joins */ 
-  return {
-   sql: stringFormat(
-    '(select distinct ' +
-    '  p.ID ' +
-    ' from ' +
-    '  %(queryTable)s as p ' +
-    '  %(joins)s ' +
-    '  %(excepts)s ' +
-    ' %(wheres)s ' +
-    ') ',
-    info),
-   params: queryParams.concat(joinParamArray).concat(exceptParamArray)};
-}
-
-/* Returns the sql to count the number of results from some other
- * query. */
-function nrSql(querySql) {
-  var queryTable;
-  var queryParams;
-
-  if (querySql == null) {
-    queryTable = 'PAD_META';
-    queryParams = [];
-  } else {
-    queryTable = querySql.sql;
-    queryParams = querySql.params;
-  }
-
-  var info = [];
-  info['query_sql'] = queryTable
-  return {
-   sql: stringFormat('(select count(*) as total from %(query_sql)s as q)', info),
-   params: queryParams};
-}
-
-/* Returns the sql to select the 10 best new tags to tack on to a
- * query, that is, the tags that are closest to halving the result-set
- * if tacked on. */
-function newTagsSql(querySql) {
-  var queryTable;
-  var queryParams;
-
-  if (querySql == null) {
-    queryTable = 'PAD_META';
-    queryParams = [];
-  } else {
-    queryTable = querySql.sql;
-    queryParams = querySql.params;
-  }
-
-  var info = [];
-  info["query_post_table"] = queryTable;
-  var queryNrSql = nrSql(querySql);
-  info["query_nr_sql"] = queryNrSql.sql;
-  queryNrParams = queryNrSql.params;
-
-  return {
-   sql: stringFormat('' +
-    'select ' +
-    ' t.NAME tagname, ' +
-    ' count(tp.PAD_ID) as matches, ' +
-    ' tn.total - count(tp.PAD_ID) as antimatches, ' +
-    ' abs(count(tp.PAD_ID) - (tn.total / 2)) as weight ' +
-    'from ' +
-    ' TAG as t, ' +
-    ' PAD_TAG as tp, ' +
-    ' %(query_nr_sql)s as tn ' +
-    'where ' +
-    ' tp.TAG_ID = t.ID ' +
-    ' and tp.PAD_ID in %(query_post_table)s ' +
-    ' and tp.PAD_ID NOT LIKE \'%$%\'' +
-    'group by t.NAME, tn.total ' +
-    'having ' +
-    ' count(tp.PAD_ID) > 0 and count(tp.PAD_ID) < tn.total ' +
-    'order by ' +
-    ' abs(count(tp.PAD_ID) - (tn.total / 2)) asc ' +
-    'limit 10 ' +
-    '', info),
-   params: queryNrParams.concat(queryParams)};
-}
-
 
 function onRequest() {  
-  var tags = new Array();
-  var antiTags = new Array();
-
-  if (request.params.query != undefined && request.params.query != '') {
-    var query = request.params.query.split(',');
-    for (i = 0; i < query.length; i++)
-     if (query[i][0] == '!')
-      antiTags.push(query[i].substring(1));
-     else
-      tags.push(query[i]);
-  }
+  var tags = tagQuery.queryToTags(request.params.query);
 
   /* Create the pad filter sql */
-  var querySql = getQueryToSql(tags.concat(['public']), antiTags);
+  var querySql = tagQuery.getQueryToSql(tags.tags.concat(['public']), tags.antiTags);
 
   /* Use the pad filter sql to figure out which tags to show in the tag browser this time. */
-  var queryNewTagsSql = newTagsSql(querySql);
+  var queryNewTagsSql = tagQuery.newTagsSql(querySql);
   var newTags = sqlobj.executeRaw(queryNewTagsSql.sql, queryNewTagsSql.params);
 
-  /* Select the 10 last changed matching pads and some extra information on them. Except the Pro Pads*/ 
-  var sql = '' +
-    'select ' +
-    '  m.id as ID, ' +
-    '  DATE_FORMAT(m.lastWriteTime, \'%a, %d %b %Y %H:%i:%s GMT\') as lastWriteTime, ' +
-    '  c.TAGS ' +
-    'from ' +
-       querySql.sql + ' as q ' +
-    '  join PAD_SQLMETA as m on ' +
-    '    m.id = q.ID ' +
-    '  join PAD_TAG_CACHE as c on ' +
-    '    c.PAD_ID = q.ID ' +
-    'where ' +
-    '  m.id NOT LIKE \'%$%\'' +
-    'order by ' +
-    '  m.lastWriteTime desc ' +
-    'limit 10';
-  var matchingPads = sqlobj.executeRaw(sql, querySql.params);
+  padSql = tagQuery.padInfoSql(querySql, 10);
+  var matchingPads = sqlobj.executeRaw(padSql.sql, padSql.params);
 
   for (i = 0; i < matchingPads.length; i++) {
     matchingPads[i].TAGS = matchingPads[i].TAGS.split('#');
@@ -252,7 +67,6 @@ function onRequest() {
 
   var isProUser = (isPro && ! padusers.isGuest(userId));
 
-
   padutils.setOptsAndCookiePrefs(request);
   var prefs = helpers.getClientVar('cookiePrefsToSet');
   var bodyClass = (prefs.isFullWidth ? "fullwidth" : "limwidth")
@@ -260,10 +74,10 @@ function onRequest() {
   var info = {
     prefs: prefs,
     config: appjet.config,
-    tagsToQuery: tagsToQuery,
+    tagQuery: tagQuery,
     padIdToReadonly: server_utils.padIdToReadonly,
-    tags: tags,
-    antiTags: antiTags,
+    tags: tags.tags,
+    antiTags: tags.antiTags,
     newTags: newTags,
     matchingPads: matchingPads,
     bodyClass: 'nonpropad',