Merge com https://bitbucket.org/seocam/atu-colab/src/e5452b943276

git-svn-id: http://repositorio.interlegis.gov.br/colab/trunk@6216 bee1b3ed-c3eb-0310-9994-b88e04532788

Merge com https://bitbucket.org/seocam/atu-colab/src/e5452b943276
git-svn-id: http://repositorio.interlegis.gov.br/colab/trunk@6216 bee1b3ed-c3eb-0310-9994-b88e04532788
seocam
1 parent beb38b3b
Showing 7 changed files with 72 additions and 27 deletions Show diff stats
colab/solrutils.py
colab/super_archives/management/commands/import_emails.py
colab/super_archives/queries.py
colab/super_archives/templates/message-preview.html
colab/super_archives/views.py
solr-conf/data-config.xml
solr-conf/schema.xml
@@ -76,7 +76,9 @@ def get_document_from_addr(doc):
     """
-    username = doc.get('Creator')
+    username = doc.get('last_author')
+    if not username:
+        username = doc.get('Creator')
     from_addresses = EmailAddress.objects.filter(user__username=username)
     if username and from_addresses:
         doc.update({'from_address': from_addresses[0]})
@@ -11,7 +11,6 @@ from optparse import make_option
 from django.db import transaction
 from django.template.defaultfilters import slugify
-from django.core.exceptions import ObjectDoesNotExist
 from django.core.management.base import BaseCommand, CommandError
 from colab.super_archives.models import MailingList, Message, \
@@ -154,13 +153,16 @@ class Command(BaseCommand, object):
         mailinglist = MailingList.objects.get_or_create(name=list_name)[0]
         mailinglist.last_imported_index = index
-        try:
-            # If the message is already at the database don't do anything
-            message = Message.objects.get(
-                                        message_id=email_msg.get('Message-ID'))
-            if message.thread.mailinglist.name != mailinglist.name:
-                raise ObjectDoesNotExist
-        except ObjectDoesNotExist:
+        # If the message is already at the database don't do anything
+        messages = Message.objects.filter(
+                                    message_id=email_msg.get('Message-ID'))
+        create = False
+        if not messages:
+            create = True 
+        elif messages[0].thread.mailinglist.name != mailinglist.name:
+            create = True
+        
+        if create:
             self.create_email(mailinglist, email_msg)
         mailinglist.save() 
+from django.core.exceptions import ObjectDoesNotExist
 from colab.super_archives.models import Thread, Vote, Message, PageHit
@@ -29,7 +30,10 @@ def get_messages_by_voted():
 def get_first_message_in_thread(mailinglist, thread_token):
     query = get_messages_by_date()
     query = query.filter(thread__mailinglist__name=mailinglist)
-    query = query.filter(thread__subject_token=thread_token)[0]
+    try:
+        query = query.filter(thread__subject_token=thread_token)[0]
+    except IndexError:
+        raise ObjectDoesNotExist
     return query
@@ -5,6 +5,9 @@
   {% if doc.Type %}
   <img alt="{{ doc.Type }}" title="{{ doc.Type }}" 
        src="{{ STATIC_URL }}img/{{ doc.Type }}.png" />
+  {% else %}
+  <img alt="thread" title="thread" 
+       src="{{ STATIC_URL }}img/thread.png" />
   {% endif %}
   {% if doc.mailinglist %}
@@ -29,13 +32,13 @@
   <div class="quiet">
     <span class="left">
-      {% trans "criado por" %}
+      {% trans "por" %}
       {% if doc.from_address.get_full_name %}
       <a href="{{ doc.from_address.get_profile_link }}">
         {{ doc.from_address.get_full_name }}
       </a>
       {% else %}
-        {% firstof doc.Creator _("anônimo") %}
+        {% firstof doc.last_author doc.Creator _("anônimo") %}
       {% endif %}
     </span>    
 # -*- coding: utf-8 -*-
+from django.http import Http404
 from django.template import RequestContext
 from django.core.paginator import Paginator
+from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import render_to_response, get_list_or_404
 from colab.super_archives import queries
@@ -10,7 +12,10 @@ from colab.super_archives.models import MailingList, Thread
 def thread(request, mailinglist, thread_token):
-    first_message = queries.get_first_message_in_thread(mailinglist, thread_token)
+    try:
+        first_message = queries.get_first_message_in_thread(mailinglist, thread_token)
+    except ObjectDoesNotExist:
+        raise Http404 
     order_by = request.GET.get('order')
     if order_by == 'voted':
         msgs_query = queries.get_messages_by_voted()
@@ -17,7 +17,7 @@
             transformer="TemplateTransformer,DateFormatTransformer"
             query="SELECT
                      name,
-                     TIMESTAMP 'epoch' + (max(time)/1000000) * INTERVAL '1s' AS modified,
+                     TIMESTAMP WITH TIME ZONE 'epoch' + (max(time)/1000000) * INTERVAL '1s' AS modified,
                      max(version) AS version
                    FROM wiki GROUP BY name"
             deltaQuery="
@@ -27,12 +27,11 @@
                 wiki
               WHERE
                 time > (EXTRACT(
-                  epoch FROM TIMESTAMP '${dataimporter.wiki.last_index_time}'
+                  epoch FROM TIMESTAMP WITH TIME ZONE '${dataimporter.wiki.last_index_time}'
                 ) * 1000000)"
             deltaImportQuery="
                    SELECT
                      name,
-                     TIMESTAMP 'epoch' + (max(time)/1000000) * INTERVAL '1s' AS modified,
                      max(version) AS version
                    FROM 
                      wiki
@@ -44,13 +43,24 @@
               dataSource="trac"
               query="SELECT 
                        author AS Creator,
-                       TIMESTAMP 'epoch' + (time/1000000) * INTERVAL '1s' AS created
+                       TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000) * INTERVAL '1s' AS created
                      FROM 
                        wiki 
                      WHERE
                        name = '${wiki.name}' 
                        AND version = 1" />
+      <entity name="wiki_modification" 
+              dataSource="trac"
+              query="SELECT 
+                       author AS last_author,
+                       TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000) * INTERVAL '1s' AS modified
+                     FROM 
+                       wiki 
+                     WHERE
+                       name = '${wiki.name}' 
+                       AND version = '${wiki.version}'" />
+      
       <entity name="wiki_collaborators"
               dataSource="trac"
               query="SELECT DISTINCT 
@@ -93,7 +103,7 @@
                   ticket
               WHERE
                 time > (EXTRACT(
-                  epoch FROM TIMESTAMP '${dataimporter.ticket.last_index_time}'
+                  epoch FROM TIMESTAMP WITH TIME ZONE '${dataimporter.ticket.last_index_time}'
                 ) * 1000000)"
             query="SELECT
                      id, 
@@ -107,8 +117,8 @@
                      reporter,
                      owner,
                      status,
-                     TIMESTAMP 'epoch' + (time/1000000)* INTERVAL '1s' AS created,
-                     TIMESTAMP 'epoch' + (changetime/1000000) * INTERVAL '1s' AS modified
+                     TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000)* INTERVAL '1s' AS created,
+                     TIMESTAMP WITH TIME ZONE 'epoch' + (changetime/1000000) * INTERVAL '1s' AS modified
                    FROM
                      ticket">
@@ -149,6 +159,18 @@
                        id = ${ticket.id} AND
                        keywords != ''" />
+      <entity name="ticket_modification"
+              dataSource="trac"
+              query="SELECT DISTINCT
+                       author AS last_author
+                     FROM 
+                       ticket_change
+                     WHERE
+                       ticket = ${ticket.id} AND
+                       time = (SELECT max(time) 
+                               FROM ticket_change 
+                               WHERE ticket = ${ticket.id});" />
+
       <entity name="ticket_comments"
               dataSource="trac"
               query="SELECT
@@ -183,7 +205,7 @@
               revision 
             WHERE
               time > (EXTRACT(
-                epoch FROM TIMESTAMP '${dataimporter.changeset.last_index_time}'
+                epoch FROM TIMESTAMP WITH TIME ZONE '${dataimporter.changeset.last_index_time}'
               ) * 1000000)"
             query="SELECT
@@ -191,8 +213,8 @@
                      author AS Creator,
                      author AS collaborator,
                      repos.value AS repos_name,
-                     TIMESTAMP 'epoch' + (time/1000000) * INTERVAL '1s' AS created,
-                     TIMESTAMP 'epoch' + (time/1000000) * INTERVAL '1s' AS modified,
+                     TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000) * INTERVAL '1s' AS created,
+                     TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000) * INTERVAL '1s' AS modified,
                      message                    
                    FROM
                      revision AS rev JOIN
@@ -274,7 +296,6 @@
               dataSource="colab"
               transformer="TemplateTransformer"
               query="SELECT DISTINCT ON (sam.thread_id)
-                       sam.body AS Description,
                        sam.received_time AS created,
                        sam.subject_clean AS subject,
                        saea.real_name AS creator_real_name,
@@ -299,11 +320,17 @@
       <entity name="latest_message"
               dataSource="colab"
               query="SELECT 
-                       received_time AS modified
+                       sam.body AS Description,
+                       sam.received_time AS modified,
+                       au.username AS last_author
                      FROM 
-                       super_archives_message
+                       super_archives_message AS sam
+                       JOIN super_archives_emailaddress AS saea
+                         ON sam.from_address_id = saea.id
+                       LEFT JOIN auth_user AS au
+                         ON au.id = saea.user_id
                      WHERE
-                       id = ${thread.latest_message_id}" />
+                       sam.id = ${thread.latest_message_id}" />
       <entity name="thread_collaborators"
               dataSource="colab"
@@ -470,6 +470,8 @@
           stored="true" required="false" multiValued="false"/>
    <field name="Creator" type="string" indexed="true"
           stored="true" required="false" multiValued="false"/>
+   <field name="last_author" type="string" indexed="true"
+          stored="true" required="false" multiValued="false"/>
    <field name="created" type="date" indexed="true"
           stored="true" required="false" multiValued="false"/>
    <field name="modified" type="date" indexed="true"