Merge branch 'testing'

Login/logout and parser

gargantext_web/urls.py

@@ -18,6 +18,7 @@ urlpatterns = patterns('',
     url(r'^grappelli/', include('grappelli.urls')),
 
     url(r'^auth/$', views.login_user),
+    url(r'^auth/logout/$', views.logout_user),
     
     # User Home view
     url(r'^$', views.home),

gargantext_web/views.py

@@ -51,6 +51,10 @@ def login_user(request):
     return render_to_response('authentication.html', context_instance=RequestContext(request))
 
 
+def logout_user(request):
+    logout(request)
+    return HttpResponseRedirect('/')
+    # Redirect to a success page.
 
 def query_to_dicts(query_string, *query_args):
     """Run a simple query and produce a generator
@@ -117,7 +121,7 @@ def projects(request):
     To each project, we can link a resource that can be an image.
     '''
     if not request.user.is_authenticated():
-        return redirect('/admin/logout/?next=%s' % request.path)
+        return redirect('/auth/')
     
     t = get_template('projects.html')
     

parsing/FileParsers/EuropressFileParser.py

@@ -3,6 +3,7 @@ import locale
 from lxml import etree
 from datetime import datetime, date
 from django.utils import timezone
+import dateutil.parser
 
 from .FileParser import FileParser
 from ..NgramsExtractors import *
@@ -23,9 +24,9 @@ class EuropressFileParser(FileParser):
         #print(len(contents))
         #return []
         encoding = self.detect_encoding(contents)
-        print(encoding)
-        if encoding != "utf-8":
-            contents = contents.decode(encoding, errors='replace').encode(codif)
+        #print(encoding)
+        #if encoding != "utf-8":
+        contents = contents.decode(encoding, errors='replace').encode(codif)
 
         try:
             html_parser = etree.HTMLParser(encoding=codif)
@@ -78,14 +79,19 @@ class EuropressFileParser(FileParser):
                             text = text.replace('ű', 'û')
                             text = text.replace(' aot ', ' août ')
 
+
                         try :
                             metadata['publication_date'] = datetime.strptime(text, '%d %B %Y')
                         except :
                             try:
                                 metadata['publication_date'] = datetime.strptime(text, '%B %Y')
                             except :
-                                print(text)
-                                pass
+                                try:
+                                    metadata['publication_date'] = dateutil.parser.parse(text)
+                                except Exception as error:
+                                    print(error)
+                                    print(text)
+                                    pass
                     
                     if test_date_en is not None:
                         localeEncoding = "en_GB.UTF-8"

templates/authentication.html

@@ -93,7 +93,7 @@
     
     <script type="text/javascript">
         (function($) {
-            $(window).load(function(){ $('#id_username').focus(); });
+            $(window).load(function(){ $('#username').focus(); });
         })(grp.jQuery);
     </script>
 </body>

templates/menu.html

@@ -43,7 +43,7 @@
 										<li><a tabindex="-1" href="/auth/">Login</a></li>
 										<li><a tabindex="-1" href="#">Profile</a></li>
 										<li class="divider"></li>
-										<li><a tabindex="-1" href="#">Help</a></li>
+										<li><a tabindex="-1" href="/auth/logout">Logout</a></li>
 								</ul>
 						</li>
 				</ul>