Merge pull request #15 from fabiobatalha/tk14

Ajuste de chaves de cache para incluir kwargs
scieloorg · Nov 13, 2015 · 6a7ce6b · 6a7ce6b
2 parents a2e4852 + 7eb0a26
commit 6a7ce6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/analytics/controller.py b/analytics/controller.py
@@ -202,9 +202,9 @@ def _compute_impact_factor(self, pub_citing_years, citable_docs):
         return cit_docs
 
     @cache_region.cache_on_arguments()
-    def impact_factor(self, issn, collection, titles):
+    def impact_factor(self, issn, collection, titles, citation_size=6):
 
-        pub_citing_years = self.bibliometrics.publication_and_citing_years(titles, citation_size=6, raw=True)
+        pub_citing_years = self.bibliometrics.publication_and_citing_years(titles, citation_size=citation_size, raw=True)
 
         citable_docs = self.publication.citable_documents(issn, collection, raw=True)
 
@@ -232,7 +232,7 @@ def _compute_impact_factor_chart(self, query_result):
 
     def impact_factor_chart(self, issn, collection, titles):
 
-        query_result = self.impact_factor(issn, collection, titles)
+        query_result = self.impact_factor(issn, collection, titles, citation_size=0)
 
         return self._compute_impact_factor_chart(query_result)
 

diff --git a/analytics/utils.py b/analytics/utils.py
@@ -24,6 +24,7 @@ def generate_key(*the_args, **the_kwargs):
             str(fname)
         ]
         key += [str(i) for i in the_args[1:]]
+        key.append(str(the_kwargs))
 
         return "_".join(key)