Conjunto de mudanças 5382 no repositório publico

Timestamp:

15/10/2011 12:39:51 (8 anos atrás)

Autor:

fabianosantos

Mensagem:

Reconfiguração da conexão ao banco de dados para permitir configuração
global padrão e configuração de acordo com DSN registrado localmente
em cada site usando collective.saconnect.

Localização:

il.spdo/trunk

Arquivos:

• il.spdo.egg-info (removido)
• il/spdo/__init__.py (modificado) (1 diff)
• il/spdo/config.py (modificado) (1 diff)
• il/spdo/configure.zcml (modificado) (1 diff)
• il/spdo/db.py (modificado) (3 diffs)
• il/spdo/db.zcml (removido)
• il/spdo/pas.py (modificado) (2 diffs)
• il/spdo/profiles/default/componentregistry.xml (modificado) (1 diff)
• il/spdo/profiles/default/metadata.xml (modificado) (1 diff)
• il/spdo/profiles/default/saconnections.xml (adicionado)
• il/spdo/saconfig.py (adicionado)
• setup.py (modificado) (1 diff)

il.spdo/trunk/il/spdo/__init__.py

@@ -1 +1 @@
 # -*- extra stuff goes here -*-
-from il.spdo import vocabulary
+from il.spdo import vocabulary, saconfig
 
 def initialize(context):

il.spdo/trunk/il/spdo/config.py

@@ -5 +5 @@
 CREATE_ALL_TABLES = True
 PATH_ANEXOS='/var/interlegis/spdo/anexos'
+DEFAULT_DSN='mysql://root:interlegis@localhost/spdo_devel?charset=utf8'
+CREATE_SAMPLES=True
 
 def Session():
-    return named_scoped_session('spdo_session')()
+    return named_scoped_session('spdo_session')
 
 MessageFactory = zope.i18nmessageid.MessageFactory('il.spdo')

il.spdo/trunk/il/spdo/configure.zcml

@@ -13 +13 @@
   <include file="skins.zcml" />
   <include file="profiles.zcml" />
-  <include file="db.zcml" />
   <include file="pas.zcml" />
   <i18n:registerTranslations directory="locales" />

il.spdo/trunk/il/spdo/db.py

@@ -5 +5 @@
 from sqlalchemy.orm import relationship, backref, sessionmaker 
 from sqlalchemy.ext.declarative import declarative_base
-from il.spdo.config import TABLE_ARGS, CREATE_ALL_TABLES, Session
+from il.spdo.config import TABLE_ARGS, CREATE_ALL_TABLES, Session, DEFAULT_DSN, CREATE_SAMPLES
 from il.spdo.interfaces import IArea, IPessoa, IShowProtocolo
 from random import choice
@@ -11 +11 @@
 import math
 import string
+import sys
 
 Base = declarative_base()
 
 if __name__ == '__main__':
-
-    #from Products.Five import zcml
-    #from Products.Five import fiveconfigure
-    #fiveconfigure.debug_mode = True
-    #import il.spdo
-    #zcml.load_config('configure.zcml', il.spdo)
-    #zcml.load_config('configure.zcml', il.spdo)
-
-    engine = create_engine('mysql://root:interlegis@localhost/spdo?charset=utf8')
+    engine = create_engine(DEFAULT_DSN)
     Session = sessionmaker(bind=engine)
 
@@ -329 +322 @@
         metadata.drop_all(engine)
         metadata.create_all(engine)
+    if not CREATE_SAMPLES:
+        sys.exit()
 
     session = Session()

il.spdo/trunk/il/spdo/pas.py

@@ -55 +55 @@
         """Consulta a pessoa usando o email como chave.
         """
-        session = Session()
-        query = session.query(Pessoa).filter_by(email=email)
-        if query.count() == 1:
-            return query.one()
-
+        #XXX: tratar corretamente a falta de base de dados
+        try:
+            session = Session()
+            query = session.query(Pessoa).filter_by(email=email)
+            if query.count() == 1:
+                return query.one()
+        except:
+            return 
 
     def getPessoaById(self, id):
@@ -131 +134 @@
                          'pluginid': self.getId(),
                         },)
+        try:
+            session = Session()
+            query = session.query(Pessoa)
+        except:
+            return ()
 
-        session = Session()
-        query = session.query(Pessoa)
         clause = None
         result = []

il.spdo/trunk/il/spdo/profiles/default/componentregistry.xml

@@ -7 +7 @@
   interface="plone.app.users.userdataschema.IUserDataSchemaProvider"
   factory="il.spdo.userdata.UserDataSchemaProvider" />
+<utility
+  interface="z3c.saconfig.interfaces.IEngineFactory"
+  factory="il.spdo.saconfig.SPDOEngineFactory" 
+  name="spdo_engine" />
 </utilities>
 </componentregistry>

il.spdo/trunk/il/spdo/profiles/default/metadata.xml

@@ -7 +7 @@
       <dependency>profile-plone.app.drafts:default</dependency>
       <dependency>profile-plone.formwidget.autocomplete:default</dependency>
+      <dependency>profile-collective.saconnect:default</dependency>
     </dependencies>
 </metadata>

il.spdo/trunk/setup.py

@@ -34 +34 @@
           'plone.formwidget.multifile',
           'plone.directives.form',
+          'plone.app.drafts',
+          'plone.formwidget.autocomplete',
+          'collective.saconnect'
           # -*- Extra requirements: -*-
       ],