remove encode functions from stark-b models thanks to makeEscapedOpti…

…onalTag function in generators.py
VAMDC · Jan 22, 2018 · 556540e · 556540e
1 parent 7d4e82b
commit 556540e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/nodes/starkb/node/dictionaries.py b/nodes/starkb/node/dictionaries.py
@@ -59,10 +59,10 @@
 
 
 #source
-'SourceTitle':'Source.encoded_title()',
+'SourceTitle':'Source.title',
 'SourceAuthorName':'Source.authors_list()',
 'SourceCategory':'journal',
-'SourceName' : 'Source.journal.encoded_name()',
+'SourceName' : 'Source.journal.name',
 'SourceVolume' : 'Source.volume',
 'SourceYear' : 'Source.publication_year',
 'SourceURI': 'Source.ads_reference',

diff --git a/nodes/starkb/node/models.py b/nodes/starkb/node/models.py
@@ -16,8 +16,8 @@ class Journal(models.Model):
     id = models.IntegerField(primary_key=True)
     name = models.CharField(max_length=225)
 
-    def encoded_name(self):
-        return escape(self.name)
+    #~ def encoded_name(self):
+        #~ return escape(self.name)
 
     class Meta:
         db_table = u't_journals'    
@@ -99,8 +99,8 @@ class Article(models.Model):
     doi_reference = models.TextField(blank=True)
     other_reference = models.TextField(blank=True)
 
-    def encoded_title(self):
-        return escape(self.title)
+    #~ def encoded_title(self):
+        #~ return escape(self.title)
 
     def authors_list(self):
         return self.authors.rsplit(',')