Conjunto de mudanças 6215 no repositório publico

Timestamp:

18/04/2012 10:20:40 (9 anos atrás)

Autor:

seocam

Mensagem:

Fazendo merge com ​https://bitbucket.org/seocam/atu-colab/src/f70c46c4b63d

Localização:

colab/trunk

Arquivos:

• colab/api/handlers.py (modificado) (2 diffs)
• colab/api/urls.py (modificado) (1 diff)
• colab/settings.py (modificado) (1 diff)
• colab/settings_local-dev.py (modificado) (1 diff)
• colab/solrutils.py (modificado) (1 diff)
• colab/static/img/opendata3.png (adicionado)
• colab/super_archives/admin.py (modificado) (1 diff)
• colab/super_archives/management/commands/import_emails.py (modificado) (5 diffs)
• colab/super_archives/migrations/0009_auto__del_field_message_mailinglist.py (adicionado)
• colab/super_archives/models.py (modificado) (1 diff)
• colab/super_archives/queries.py (modificado) (1 diff)
• colab/super_archives/views.py (modificado) (1 diff)
• colab/templates/base.html (modificado) (1 diff)
• colab/templates/open-data.html (adicionado)
• colab/urls.py (modificado) (2 diffs)
• etc/apache2/sites-available/colab (modificado) (1 diff)
• setup.py (modificado) (1 diff)

colab/trunk/colab/api/handlers.py

@@ -8 +8 @@
 from piston.handler import BaseHandler
 
+from colab import solrutils
 from colab.super_archives.models import Message, PageHit
 
@@ -70 +71 @@
         return rc.CREATED
 
+class SearchHandler(BaseHandler):
+    allowed_methods = ('GET', )
+
+    def read(self, request):
+        query = request.GET.get('q')
+        page = request.GET.get('p', 1)
+        results_per_page = request.GET.get('n', 50)
+        order = request.GET.get('o')
+
+        if not query:
+            return 'Query cannot be empty.'
+        else:
+            query = query.encode('utf-8')
+
+        try: 
+            n = int(results_per_page)
+        except ValueError:
+            n = 10
+    
+        if 1 > n > 500:
+            n = 1
+        
+        try:
+            page = int(page)
+        except ValueError:
+            page = 1
+        
+        if page < 1:
+            page = 1
+
+        return solrutils.select(query, results_per_page, page, order)

colab/trunk/colab/api/urls.py

@@ -3 +3 @@
 from piston.resource import Resource
 
-from colab.api.handlers import VoteHandler, CountHandler
+from colab.api.handlers import VoteHandler, CountHandler, SearchHandler
 
 
 vote_handler = Resource(VoteHandler)
 count_handler = Resource(CountHandler)
+search_handler = Resource(SearchHandler)
 
 urlpatterns = patterns('',
     url(r'message/(?P<message_id>\d+)/vote$', vote_handler),
     url(r'hit/$', count_handler),
+    url(r'search/$', search_handler),
 )

colab/trunk/colab/settings.py

@@ -154 +154 @@
 SOLR_SELECT_PATH = '/solr/select'
 
-SOLR_COLAB_URI = 'http://colab.interlegis.gov.br'
+SOLR_COLAB_URI = 'http://colab.interlegis.leg.br'
 SOLR_BASE_QUERY = """
     ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *]) 

colab/trunk/colab/settings_local-dev.py

@@ -15 +15 @@
 }
 
+SOLR_COLAB_URI = None
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
 
-import socks
-SOCKS_TYPE = socks.PROXY_TYPE_SOCKS5
-SOCKS_SERVER = '127.0.0.1'
-SOCKS_PORT = 9050
+#import socks
+#SOCKS_TYPE = socks.PROXY_TYPE_SOCKS5
+#SOCKS_SERVER = '127.0.0.1'
+#SOCKS_PORT = 9050
 

colab/trunk/colab/solrutils.py

@@ -62 +62 @@
     
     url = ''
-    if doc_type in ('ticket', 'wiki', 'changeset'):
+    if settings.SOLR_COLAB_URI:
         url += settings.SOLR_COLAB_URI
     

colab/trunk/colab/super_archives/admin.py

@@ -4 +4 @@
 
 class MessageAdmin(admin.ModelAdmin):
-    list_filter = ('spam', 'mailinglist', 'received_time', )
+    list_filter = ('spam', 'thread__mailinglist', 'received_time', )
     search_fields = (
         'id',

colab/trunk/colab/super_archives/management/commands/import_emails.py

@@ -131 +131 @@
                 yield mailinglist_name, msg, index
 
-    def get_thread(self, email):
+    def get_thread(self, email, mailinglist):
         """Group messages by thread looking for similar subjects"""
         
@@ -138 +138 @@
         if thread is None:
             thread = Thread.objects.get_or_create(
-                mailinglist=email.mailinglist,
+                mailinglist=mailinglist,
                 subject_token=subject_slug
             )[0]
@@ -157 +157 @@
         try:
             # If the message is already at the database don't do anything
-            Message.objects.get(message_id=email_msg.get('Message-ID'))
+            message = Message.objects.get(
+                                        message_id=email_msg.get('Message-ID'))
+            if message.thread.mailinglist.name != mailinglist.name:
+                raise ObjectDoesNotExist
         except ObjectDoesNotExist:
             self.create_email(mailinglist, email_msg)
@@ -182 +185 @@
             message_id=email_msg.get('Message-ID'),
             from_address=email_addr,
-            mailinglist=mailinglist,
             subject=subject,
             subject_clean=self.RE_SUBJECT_CLEAN.sub('', subject).strip(),
@@ -188 +190 @@
             received_time=email_msg.get_received_datetime(),
         )
-        email.thread = self.get_thread(email)
+        email.thread = self.get_thread(email, mailinglist)
         email.save()
 

colab/trunk/colab/super_archives/models.py

@@ -195 +195 @@
                                 self.from_address.get_full_name(), 
                                 self.subject_clean)
+    
+    @property
+    def mailinglist(self):
+        if not self.thread or not self.thread.mailinglist:
+            return None
+        
+        return self.thread.mailinglist
+
         
     def vote_list(self):

colab/trunk/colab/super_archives/queries.py

@@ -29 +29 @@
 def get_first_message_in_thread(mailinglist, thread_token):
     query = get_messages_by_date()
-    query = query.filter(mailinglist__name=mailinglist)
+    query = query.filter(thread__mailinglist__name=mailinglist)
     query = query.filter(thread__subject_token=thread_token)[0]
     return query

colab/trunk/colab/super_archives/views.py

@@ -19 +19 @@
     
     msgs_query = msgs_query.filter(thread__subject_token=thread_token)
-    msgs_query = msgs_query.filter(mailinglist__name=mailinglist)
+    msgs_query = msgs_query.filter(thread__mailinglist__name=mailinglist)
     emails = msgs_query.exclude(id=first_message.id)
     

colab/trunk/colab/templates/base.html

@@ -138 +138 @@
     <div id="footer" class="span-24 center">
       {% block footer %}
+        <p><a href="{% url opendata %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>
         <p>O conteúdo deste site está publicado sob a licença <a
           href="http://creativecommons.org/licenses/by-nc-sa/2.0/br/">Creative

colab/trunk/colab/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import patterns, include, url
+from django.views.generic.simple import direct_to_template
 
 # Uncomment the next two lines to enable the admin:
@@ -9 +10 @@
 
     url(r'^archives/', include('colab.super_archives.urls')),
-
+    
     url(r'^api/', include('colab.api.urls')),
     
     url(r'^rss/', include('colab.rss.urls')),
+
+    url(r'open-data/$', direct_to_template, {'template': 'open-data.html'}, 
+        name='opendata'),
 
     url(r'^user/(?P<username>[\w@+.-]+)/?$',

colab/trunk/etc/apache2/sites-available/colab

@@ -24 +24 @@
         RewriteRule ^/about(.*) http://colab-backend.interlegis.leg.br/about$1 [P]
         RewriteRule ^/prefs(.*) http://colab-backend.interlegis.leg.br/prefs$1 [P]
+        RewriteRule ^/log(.*) http://colab-backend.interlegis.leg.br/log$1 [P]
         RewriteRule ^/login(.*) http://colab-backend.interlegis.leg.br/login$1 [P]
         RewriteRule ^/logout(.*) http://colab-backend.interlegis.leg.br/logout$1 [P]

colab/trunk/setup.py

@@ -5 +5 @@
 
 setup(name='colab',
-      version='0.1-dev',
+      version='3.0',
       author='Sergio Oliveira',
       author_email='seocam@seocam.com',