Merge pull request #251 from golnazads/master

updated aastex, aspc, mnras, and soph formats to output volume and page …
adsabs · May 8, 2024 · 044235b · 044235b
2 parents f9ce835 + 528cd9c
commit 044235b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/exportsrv/cslstyles/aastex.csl b/exportsrv/cslstyles/aastex.csl
@@ -52,7 +52,7 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article paper-conference personal_communication review-book thesis" match="any">
+      <if type="article paper-conference personal_communication review-book thesis article-journal" match="any">
         <group prefix="">
           <group>
             <text variable="volume" prefix=", "/>

diff --git a/exportsrv/cslstyles/aspc.csl b/exportsrv/cslstyles/aspc.csl
@@ -65,7 +65,7 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article paper-conference personal_communication review-book thesis" match="any">
+      <if type="article paper-conference personal_communication review-book thesis article-journal" match="any">
         <group prefix="">
           <group>
             <text variable="volume" prefix=", "/>

diff --git a/exportsrv/cslstyles/mnras.csl b/exportsrv/cslstyles/mnras.csl
@@ -37,7 +37,7 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article paper-conference personal_communication review-book thesis" match="any">
+      <if type="article paper-conference personal_communication review-book thesis article-journal" match="any">
         <group prefix="">
           <group>
             <text variable="volume" prefix=", "/>

diff --git a/exportsrv/cslstyles/soph.csl b/exportsrv/cslstyles/soph.csl
@@ -48,7 +48,7 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article paper-conference personal_communication review-book thesis" match="any">
+      <if type="article paper-conference personal_communication review-book thesis article-journal" match="any">
         <group prefix="">
           <group>
             <text variable="volume" prefix=" " font-weight="bold"/>

diff --git a/exportsrv/formatter/cslJson.py b/exportsrv/formatter/cslJson.py
@@ -32,11 +32,11 @@ def __get_cls_author_list(self, a_doc):
         return author_list
 
 
-    def __get_doc_type(self, solr_type):
+    def __get_doc_type(self, doc_type):
         """
         convert document type from solr to csl
         
-        :param solr_type: 
+        :param doc_type: 
         :return: 
         """
         fields = {'article':'article', 'book':'book', 'inbook':'chapter',
@@ -50,7 +50,7 @@ def __get_doc_type(self, solr_type):
                   'proposal':'personal_communication', 'editorial':'personal_communication', 
                   'erratum':'personal_communication', 'obituary':'personal_communication',
                   'dataset':'software'}
-        return fields.get(solr_type, '')
+        return fields.get(doc_type, '')
 
 
     def __get_doc_pub(self, a_doc):