From 9708a6fa6428332ec6c15ac223db94d2752a3abb Mon Sep 17 00:00:00 2001
From: ppc19 <ppc19@inf.ufpr.br>
Date: Mon, 13 Sep 2021 14:03:52 -0300
Subject: [PATCH] hotfix - strip parenthesis from derivative
---
database/database_table.py | 4 +++-
mapping-protocols | 2 +-
settings.py | 2 +-
sql-scripts | 2 +-
table-definitions | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/database/database_table.py b/database/database_table.py
index db43ad3..d44e689 100644
--- a/database/database_table.py
+++ b/database/database_table.py
@@ -840,9 +840,11 @@ class DatabaseTable(Table):
case_tokens = case.split(" ")
case_tokens = case.split(' ')
for i in range(0, len(case_tokens)):
- # remove everything prior to first, and after last quotation mark (including them)
+ # strip everything before and after quotation marks and parentheses (including them)
token_varname = re.sub(r'(^[^\"]*[\"])', '', case_tokens[i])
token_varname = re.sub(r'([\"][^\"]*$)', '', token_varname)
+ token_varname = re.sub(r'(^[^\(]*[\(])', '', token_varname)
+ token_varname = re.sub(r'([\)][^\)]*$)', '', token_varname)
if (token_varname == var_name):
case_tokens[i] = case_tokens[i].replace(var_name, var_db)
diff --git a/mapping-protocols b/mapping-protocols
index 7f70b1e..fd005c2 160000
--- a/mapping-protocols
+++ b/mapping-protocols
@@ -1 +1 @@
-Subproject commit 7f70b1e8a341c56c4b551e45343b4cd24ac3f959
+Subproject commit fd005c23b135180b365a5267c970aba3f025ec4e
diff --git a/settings.py b/settings.py
index 36dd10f..6aa13e6 100644
--- a/settings.py
+++ b/settings.py
@@ -33,7 +33,7 @@ DATABASE_USER_PASSWORD = 'monetdb'
DATABASE_HOST = 'localhost'
# Database to connect to
-DATABASE = 'hotmapper_demo'
+DATABASE = 'aux_hotmapper'
# Column used to run aggregations and denormalizations
YEAR_COLUMN = 'ano_censo'
diff --git a/sql-scripts b/sql-scripts
index 9bd31ae..a98d1ac 160000
--- a/sql-scripts
+++ b/sql-scripts
@@ -1 +1 @@
-Subproject commit 9bd31ae76699d32e99e45b8f44918fbc7e445d0b
+Subproject commit a98d1ac004ddffad18d50286282cbc401e56f32d
diff --git a/table-definitions b/table-definitions
index a3fad29..0fd2d8b 160000
--- a/table-definitions
+++ b/table-definitions
@@ -1 +1 @@
-Subproject commit a3fad296971b7cd55bf98796bc4cae63f6f02463
+Subproject commit 0fd2d8bc9b0c56225dea1ebfcba3d356b4b9ed03
--
GitLab