Realizando join de campos de endereço

scieloorg · Sep 8, 2014 · 3f20cb6 · 3f20cb6
1 parent 7b6660a
commit 3f20cb6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/delorean/domain.py b/delorean/domain.py
@@ -415,25 +415,25 @@ def get_data(self, obj):
 
         joined_editor_address = []
 
-        if 'editor_address' in obj and obj['editor_address'] != '':
+        if 'editor_address' in obj and obj['editor_address']:
             joined_editor_address.append(obj['editor_address'])
 
-        if 'editor_address_city' in obj and obj['editor_address_city'] != '':
+        if 'editor_address_city' in obj and obj['editor_address_city']:
             joined_editor_address.append(obj['editor_address_city'])
 
-        if 'editor_address_state' in obj and obj['editor_address_state'] != '':
+        if 'editor_address_state' in obj and obj['editor_address_state']:
             joined_editor_address.append(obj['editor_address_state'])
 
-        if 'editor_address_country' in obj and obj['editor_address_country'] != '':
+        if 'editor_address_country' in obj and obj['editor_address_country']:
             joined_editor_address.append(obj['editor_address_country'])
 
-        if 'editor_address_zip' in obj and obj['editor_address_zip'] != '':
+        if 'editor_address_zip' in obj and obj['editor_address_zip']:
             joined_editor_address.append(obj['editor_address_zip'])
 
-        if 'editor_phone1' in obj and obj['editor_phone1'] != '':
+        if 'editor_phone1' in obj and obj['editor_phone1']:
             joined_editor_address.append(obj['editor_phone1'])
 
-        if 'editor_phone2' in obj and obj['editor_phone2'] != '':
+        if 'editor_phone2' in obj and obj['editor_phone2']:
             joined_editor_address.append(obj['editor_phone2'])
 
 

diff --git a/delorean/templates/title_db_entry.txt b/delorean/templates/title_db_entry.txt
@@ -43,7 +43,7 @@
 % endif
 ##
 % if editor_address is not UNDEFINED and editor_address:
-!v063!${editor_address}
+!v063!${editor_address_joined}
 % endif
 ##
 % if editor_email is not UNDEFINED and editor_email: