Commit bd79d0e28ce34ebf54c714a2ae5cc08d97dd4f6e
1 parent
d68741f4
Exists in
master
Alterações do lbbulk
git-svn-id: http://svn.brlight.net/svn/lightbase-neo/trunk/LBBulk@957 29b92fdf-8c97-4584-b987-84e8d3c556fa
Showing
2 changed files
with
7 additions
and
5 deletions
Show diff stats
lbbulk/model/BulkUpload.py
@@ -18,7 +18,8 @@ class BulkUpload(Base): | @@ -18,7 +18,8 @@ class BulkUpload(Base): | ||
18 | __table__ = bulk_upload | 18 | __table__ = bulk_upload |
19 | 19 | ||
20 | def verifica_registro(data): | 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 | registro_existe = q.first() | 23 | registro_existe = q.first() |
23 | return registro_existe | 24 | return registro_existe |
24 | 25 | ||
@@ -31,4 +32,4 @@ class BulkUploadContextFactory(SQLAlchemyORMContext): | @@ -31,4 +32,4 @@ class BulkUploadContextFactory(SQLAlchemyORMContext): | ||
31 | 32 | ||
32 | def get_member_id_as_string(self, member): | 33 | def get_member_id_as_string(self, member): |
33 | id = self.get_member_id(member) | 34 | id = self.get_member_id(member) |
34 | - return json.dumps(id, cls=self.json_encoder) | ||
35 | \ No newline at end of file | 35 | \ No newline at end of file |
36 | + return json.dumps(id, cls=self.json_encoder) |
lbbulk/view/restfulview.py
@@ -36,8 +36,9 @@ class RegCustomView(RESTfulView): | @@ -36,8 +36,9 @@ class RegCustomView(RESTfulView): | ||
36 | # print(existente.id_reg) | 36 | # print(existente.id_reg) |
37 | print('\n\n\n\n\n\n\n\n\n\n') | 37 | print('\n\n\n\n\n\n\n\n\n\n') |
38 | registro = self.is_error(data) | 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 | chave_externa = registro['json_reg']['id_reg'] | 42 | chave_externa = registro['json_reg']['id_reg'] |
42 | registro['json_reg'].pop('id_reg', None) | 43 | registro['json_reg'].pop('id_reg', None) |
43 | registro['json_reg'] = json.dumps(registro['json_reg']) | 44 | registro['json_reg'] = json.dumps(registro['json_reg']) |
@@ -69,4 +70,4 @@ class RegCustomView(RESTfulView): | @@ -69,4 +70,4 @@ class RegCustomView(RESTfulView): | ||
69 | def is_error_resp(self,r): | 70 | def is_error_resp(self,r): |
70 | if type(r) is dict: | 71 | if type(r) is dict: |
71 | raise TypeError('Lightbase error ' + str(r['_status']) + ': ' + r['_error_message']) | 72 | raise TypeError('Lightbase error ' + str(r['_status']) + ': ' + r['_error_message']) |
72 | - return r | ||
73 | \ No newline at end of file | 73 | \ No newline at end of file |
74 | + return r |