Merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/1022223 into lp:~ubuntu-it-ask/ubuntu-it-ask/dev

[Giuseppe Terrasi]

=== modified file '00-FIXME'
--- 00-FIXME	2012-08-03 19:06:00 +0000
+++ 00-FIXME	2012-08-05 06:03:19 +0000
@@ -18,7 +18,7 @@
 
 = settings_local.py =
 
-Disabilitati i seguenti moduli, di default abilitati: mysqlfulltext, localauth, oauthauth, facebookauth
+Disabilitati i seguenti moduli, di default abilitati: mysqlfulltext, localauth, oauthauth, facebookauth, sphinxfulltext
 
 = forum/skins/light/media/js/wmd/wmd.js =
 
@@ -51,3 +51,7 @@
 
 = forum/templatetags/extra_tags.py =
 FIXME: proporre cambiamento upstream come da lp:~giuseppeterrasi/ubuntu-it-ask/l18ned
+
+= forum_modules/pgfulltext =
+
+sostituito "english" con "italian"

=== modified file '00-README'
--- 00-README	2012-07-20 20:58:48 +0000
+++ 00-README	2012-08-05 06:03:19 +0000
@@ -27,13 +27,14 @@
  c) timezone in Europe/Rome
  d) languages in IT
  e) DJANGO_VERSION = 1.3
- f) DISABLED_MODULES add 'mysqlfulltxt', 'localauth'
+ f) DISABLED_MODULES add 'mysqlfulltxt', 'localauth' 'sphinxfullsearch'
  g) CACHE_BACKEND = 'memcached://<server-address>:<port>/ with the correct path.
 5) python manage.py syncdb --all (no create super user)
 6) python manage.py migrate forum --fake
 7) cp -R locale l it
 8) python manage.py makemessages -l it
 
+
 ** Note: an example of settings_local.py with right database settings (line 27): http://bazaar.launchpad.net/~ubuntu-it-ask/ubuntu-it-ask/trunk/view/head:/settings_local.py
 
 
@@ -52,6 +53,12 @@
 
 (if you need a dump of this table, please use: pg_dump ubuntu-it-chiedi --clean -O -t forum_keyvalue -f forum_keyvalue.sql -U ubuntu-it-chiedi -W )
 
+= Configure pgfulltext =
+
+1) cd forum_modules/pgfulltext
+2) psql -U ubuntu-it-chiedi ubuntu-it-chiedi -W < pg_fts_install.sql
+3) python /src/CHANGE_THIS_PATH/www/osqa/manage.py syncdb
+
 = Other =
 
 We can perform other changes, if needed, using bzr with no access on

=== modified file 'forum_modules/pgfulltext/handlers.py'
--- forum_modules/pgfulltext/handlers.py	2012-06-22 20:37:14 +0000
+++ forum_modules/pgfulltext/handlers.py	2012-08-05 06:03:19 +0000
@@ -16,11 +16,11 @@
             tables = ['forum_rootnode_doc'],
             select={
             'ranking': """
-                                rank_exact_matches(ts_rank_cd('{0.1, 0.2, 0.8, 1.0}'::float4[], "forum_rootnode_doc"."document", to_tsquery('english', %s), 32))
+                                rank_exact_matches(ts_rank_cd('{0.1, 0.2, 0.8, 1.0}'::float4[], "forum_rootnode_doc"."document", to_tsquery('italian', %s), 32))
                                 """,
             },
             where=["""
-                           "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
+                           "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('italian', %s) OR
                            "forum_node"."title" ILIKE %s)
                            """],
             params=[tsquery, ilike],

=== modified file 'forum_modules/pgfulltext/pg_fts_install.sql'
--- forum_modules/pgfulltext/pg_fts_install.sql	2012-06-22 20:37:14 +0000
+++ forum_modules/pgfulltext/pg_fts_install.sql	2012-08-05 06:03:19 +0000
@@ -54,15 +54,15 @@
     END IF;
 
     SELECT
-      setweight(to_tsvector('english', coalesce(tagnames,'')), 'A') ||
-      setweight(to_tsvector('english', coalesce(title,'')), 'B') ||
-      setweight(to_tsvector('english', coalesce(body,'')), 'C') INTO doc
+      setweight(to_tsvector('italian', coalesce(tagnames,'')), 'A') ||
+      setweight(to_tsvector('italian', coalesce(title,'')), 'B') ||
+      setweight(to_tsvector('italian', coalesce(body,'')), 'C') INTO doc
       FROM forum_node WHERE id = root_id;
 
     SELECT count(*)::int INTO rcount FROM forum_node WHERE abs_parent_id = root_id AND (NOT state_string LIKE '%%deleted%%');
 
     IF rcount > 0 THEN
-       FOR cv in SELECT setweight(to_tsvector('english', coalesce(body,'')), 'C') FROM forum_node WHERE abs_parent_id = root_id  AND (NOT state_string LIKE '%%deleted%%') LOOP
+       FOR cv in SELECT setweight(to_tsvector('italian', coalesce(body,'')), 'C') FROM forum_node WHERE abs_parent_id = root_id  AND (NOT state_string LIKE '%%deleted%%') LOOP
            doc :=(doc || cv);
        END LOOP;
      END IF;

=== modified file 'settings_local.py'
--- settings_local.py	2012-07-15 16:14:56 +0000
+++ settings_local.py	2012-08-05 06:03:19 +0000
@@ -46,7 +46,7 @@
 # This should be equal to your domain name, plus the web application context.
 # This shouldn't be followed by a trailing slash.
 # I.e., http://www.yoursite.com or http://www.hostedsite.com/yourhostapp
-APP_URL = 'http://CHANGE_THIS_PATH'
+APP_URL = 'http://chiedi.ubuntu-it.org'
 
 #LOCALIZATIONS
 TIME_ZONE = 'Europe/Rome'
@@ -57,7 +57,7 @@
 LANGUAGE_CODE = 'it'
 
 DJANGO_VERSION = 1.3
-OSQA_DEFAULT_SKIN = 'default'
+OSQA_DEFAULT_SKIN = 'light'
 
 # disable mysqlfulltxt and local authentication (registrations users)
-DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltext', 'localauth', 'oauthauth', 'facebookauth']
+DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltext', 'localauth', 'oauthauth', 'facebookauth', 'sphinxfulltext']