# HG changeset patch
# User cavaliet
# Date 1402993977 -7200
# Node ID 1c774f7a0341a6d92e89a97dada2825a5784be25
# Parent  8f77cf71ab020584723c5db5fa33a25c3999ab8a# Parent  0f8c8b16cb58987fb71a997407cf06a8873bbbbb
Merge with 0f8c8b16cb58987fb71a997407cf06a8873bbbbb

diff -r 8f77cf71ab02 -r 1c774f7a0341 .hgignore
--- a/.hgignore	Tue Jun 17 10:25:33 2014 +0200
+++ b/.hgignore	Tue Jun 17 10:32:57 2014 +0200
@@ -4,8 +4,7 @@
 *.pyc
 
 syntax: regexp
-^web/hdabo/config\.py$
-^web/hdabo/.htaccess$
+^web/.htaccess$
 
 syntax: regexp
 ^web/static/site$
diff -r 8f77cf71ab02 -r 1c774f7a0341 .pydevproject
--- a/.pydevproject	Tue Jun 17 10:25:33 2014 +0200
+++ b/.pydevproject	Tue Jun 17 10:32:57 2014 +0200
@@ -2,7 +2,7 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">hdabo_python</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/hdabo/web</path>
diff -r 8f77cf71ab02 -r 1c774f7a0341 .settings/org.eclipse.core.resources.prefs
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdabo/config.py.tmpl
--- a/src/hdabo/config.py.tmpl	Tue Jun 17 10:25:33 2014 +0200
+++ b/src/hdabo/config.py.tmpl	Tue Jun 17 10:32:57 2014 +0200
@@ -1,7 +1,7 @@
 import os
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/"
-BASE_URL = '/~ymh/hdabo/'
+BASE_URL = '/hdabo/'
 WEB_URL = 'http://localhost'
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
@@ -42,6 +42,14 @@
     }
 }
 
-HAYSTACK_SEARCH_ENGINE = 'whoosh'
-HAYSTACK_WHOOSH_PATH = os.path.abspath(BASE_DIR + "../index/").rstrip("/")+"/"
+#HAYSTACK_SEARCH_ENGINE = 'whoosh'
+#HAYSTACK_WHOOSH_PATH = os.path.abspath(BASE_DIR + "../index/").rstrip("/")+"/"
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        #'ENGINE': 'hdabo.search.french_whoosh_backend.SearchBackend',
+        'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
+        'URL': '',
+        'INDEX_NAME': ''
+    },
+}
 
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdabo/django_wsgi.py
--- a/src/hdabo/django_wsgi.py	Tue Jun 17 10:25:33 2014 +0200
+++ b/src/hdabo/django_wsgi.py	Tue Jun 17 10:32:57 2014 +0200
@@ -1,5 +1,7 @@
 import os
 
+os.environ['DJANGO_SETTINGS_MODULE'] = 'spel.settings'
+ 
 import django.core.handlers.wsgi
 
 application = django.core.handlers.wsgi.WSGIHandler()
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdabo/management/commands/order_tags.py
--- a/src/hdabo/management/commands/order_tags.py	Tue Jun 17 10:25:33 2014 +0200
+++ b/src/hdabo/management/commands/order_tags.py	Tue Jun 17 10:32:57 2014 +0200
@@ -69,7 +69,7 @@
 
         try:
             for i, ds in enumerate(queryset):
-                show_progress(i + 1, total, ds.title, 60)
+                self.show_progress(i + 1, total, 60)
                 reorder_datasheet_tags(ds)
                 transaction.commit()
         except:
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdabo/models.py
--- a/src/hdabo/models.py	Tue Jun 17 10:25:33 2014 +0200
+++ b/src/hdabo/models.py	Tue Jun 17 10:32:57 2014 +0200
@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
 
 from django.conf import settings
-from django.contrib.auth.models import User
+from django.contrib.auth.models import AbstractUser
 from django.db import models
 from hdabo.utils import Property, normalize
 import datetime
 
 
+# User Class, due to migration to django 1.6.5
+class User(AbstractUser):
+    class Meta:
+        db_table = 'auth_user'
+
 
 class SortedModelManager(models.Manager):
     use_for_related_fields = True
@@ -399,6 +404,3 @@
 class Datasheet_primary_themes(SortedDatasheetLink):
     domain = models.ForeignKey(Domain, db_index=True, null=False, blank=False)
     
-        
-
-    
\ No newline at end of file
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdabo/settings.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/README.txt
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/__init__.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/de/LC_MESSAGES/django.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/de/LC_MESSAGES/django.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/de/LC_MESSAGES/djangojs.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/de/LC_MESSAGES/djangojs.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/en/LC_MESSAGES/django.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/en/LC_MESSAGES/django.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/en/LC_MESSAGES/djangojs.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/en/LC_MESSAGES/djangojs.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/es/LC_MESSAGES/django.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/es/LC_MESSAGES/django.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/es/LC_MESSAGES/djangojs.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/es/LC_MESSAGES/djangojs.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/fr/LC_MESSAGES/djangojs.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/fr/LC_MESSAGES/djangojs.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/it/LC_MESSAGES/django.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/it/LC_MESSAGES/django.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/it/LC_MESSAGES/djangojs.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/it/LC_MESSAGES/djangojs.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/ja/LC_MESSAGES/django.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/ja/LC_MESSAGES/djangojs.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/ja/LC_MESSAGES/djangojs.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/zh-tw/LC_MESSAGES/djangojs.mo
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/locale/zh-tw/LC_MESSAGES/djangojs.po
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/management/commands/import_hda_insee_csv.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/management/commands/import_hdabo_db.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/management/commands/import_insee_csv.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/management/commands/query_dbpedia.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/models/__init__.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/models/categories.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/models/dataviz.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/static/hdalab/css/common.css
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/static/hdalab/css/facettes.css
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/static/hdalab/css/index.css
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/static/hdalab/img/facettes-preview.jpg
Binary file src/hdalab/static/hdalab/img/facettes-preview.jpg has changed
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/static/hdalab/js/gomina.js
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/templates/base.html
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/templates/facettes.html
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/templates/index.html
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/urls.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 src/hdalab/views/ajax.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 virtualenv/res/lib/lib_create_env.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 virtualenv/res/src/lxml-2.3.tar.bz2
Binary file virtualenv/res/src/lxml-2.3.tar.bz2 has changed
diff -r 8f77cf71ab02 -r 1c774f7a0341 virtualenv/res/src/pylucene-4.8.0-1-src.tar.gz
Binary file virtualenv/res/src/pylucene-4.8.0-1-src.tar.gz has changed
diff -r 8f77cf71ab02 -r 1c774f7a0341 virtualenv/web/res/res_create_env.py
diff -r 8f77cf71ab02 -r 1c774f7a0341 virtualenv/web/virtualenv.py