Download as
Browse Code »

Commit 99c0af9a0ecebf8a5a1bc9de1c10c2ac38c0046b

Authored by Eduardo Santos
2 parents 194cafc3 bd79d0e2
Exists in master

Merge branch 'master', remote branch 'git-svn'

Showing 4 changed files with 11 additions and 9 deletions   Show diff stats
development.ini
  Diff comments   View file @99c0af9
... ... @@ -9,10 +9,10 @@ pyramid.default_locale_name = en
9 9 pyramid.includes =
10 10 pyramid_tm
11 11  
12   -sqlalchemy.url = postgresql://rest:rest@localhost/lbbulk
  12 +sqlalchemy.url = postgresql://rest:rest@localhost/projeto1
13 13  
14 14 domain = http://api.brlight.org
15   -base_name = wmi
  15 +base_name = wmi_teste
16 16  
17 17 [server:main]
18 18 use = egg:waitress#main
... ...
lbbulk/model/BulkSources.py
  Diff comments   View file @99c0af9
... ... @@ -3,7 +3,7 @@ from pyramid_restler.model import SQLAlchemyORMContext
3 3 from lbbulk.model import Base, metadata, session
4 4  
5 5  
6   -bulk_source = Table('lb_bulk_source', metadata,
  6 +bulk_source = Table('lb_bulk_sources', metadata,
7 7 Column('id_source', Integer, primary_key=True),
8 8 Column('nome_source', String, nullable=False)
9 9 )
... ...
lbbulk/model/BulkUpload.py
  Diff comments   View file @99c0af9
... ... @@ -18,7 +18,8 @@ class BulkUpload(Base):
18 18 __table__ = bulk_upload
19 19  
20 20 def verifica_registro(data):
21   - q = session.query(BulkUpload).filter_by(id_source=data['id_source'], chave_externa=data['json_reg']['id_reg'] )
  21 +# q = session.query(BulkUpload).filter_by(id_source=data['id_source'], chave_externa=data['json_reg']['id_reg'] )
  22 + q = session.query(BulkUpload).filter_by(id_source=1, chave_externa=data['json_reg']['id_reg'] )
22 23 registro_existe = q.first()
23 24 return registro_existe
24 25  
... ... @@ -31,4 +32,4 @@ class BulkUploadContextFactory(SQLAlchemyORMContext):
31 32  
32 33 def get_member_id_as_string(self, member):
33 34 id = self.get_member_id(member)
34   - return json.dumps(id, cls=self.json_encoder)
35 35 \ No newline at end of file
  36 + return json.dumps(id, cls=self.json_encoder)
... ...
lbbulk/view/restfulview.py
  Diff comments   View file @99c0af9
... ... @@ -36,8 +36,9 @@ class RegCustomView(RESTfulView):
36 36 # print(existente.id_reg)
37 37 print('\n\n\n\n\n\n\n\n\n\n')
38 38 registro = self.is_error(data)
39   - id_source = registro['id_source']
40   - registro.pop('id_source', None)
  39 + #id_source = registro['id_source']
  40 + #registro.pop('id_source', None)
  41 + id_source = 1
41 42 chave_externa = registro['json_reg']['id_reg']
42 43 registro['json_reg'].pop('id_reg', None)
43 44 registro['json_reg'] = json.dumps(registro['json_reg'])
... ... @@ -59,7 +60,7 @@ class RegCustomView(RESTfulView):
59 60 def get_url_lightbase(self): #TODO
60 61 """ Returns url from config """
61 62 domain = 'http://api.brlight.org'
62   - base_name = 'wmi'
  63 + base_name = 'wmi_teste'
63 64 url = domain + '/' + base_name + '/reg'
64 65 return url
65 66  
... ... @@ -69,4 +70,4 @@ class RegCustomView(RESTfulView):
69 70 def is_error_resp(self,r):
70 71 if type(r) is dict:
71 72 raise TypeError('Lightbase error ' + str(r['_status']) + ': ' + r['_error_message'])
72   - return r
73 73 \ No newline at end of file
  74 + return r
... ...