diff --git a/exportsrv/formatter/bibTexFormat.py b/exportsrv/formatter/bibTexFormat.py index 75c8359..d29c0b1 100755 --- a/exportsrv/formatter/bibTexFormat.py +++ b/exportsrv/formatter/bibTexFormat.py @@ -94,7 +94,7 @@ def __get_doc_type(self, solr_type): 'misc':'@MISC', 'proposal':'@MISC', 'pressrelease':'@MISC', 'talk':'@MISC', 'software':'@software', 'dataset':'@dataset', 'phdthesis':'@PHDTHESIS','mastersthesis':'@MASTERSTHESIS', - 'techreport':'@MISC', 'intechreport':'@MISC'} + 'techreport':'@MISC', 'intechreport':'@MISC','instrument':'@MISC','service':'@MISC'} return fields.get(solr_type, '') diff --git a/exportsrv/formatter/cslJson.py b/exportsrv/formatter/cslJson.py index 2c823ae..7be3253 100755 --- a/exportsrv/formatter/cslJson.py +++ b/exportsrv/formatter/cslJson.py @@ -50,7 +50,7 @@ def __get_doc_type(self, doc_type): 'phdthesis':'thesis','mastersthesis':'thesis', 'proposal':'personal_communication', 'editorial':'personal_communication', 'erratum':'personal_communication', 'obituary':'personal_communication', - 'dataset':'software'} + 'dataset':'software','instrument':'software','service':'software'} return fields.get(doc_type, '') diff --git a/exportsrv/formatter/fieldedFormat.py b/exportsrv/formatter/fieldedFormat.py index 91f10cf..02baffb 100755 --- a/exportsrv/formatter/fieldedFormat.py +++ b/exportsrv/formatter/fieldedFormat.py @@ -65,7 +65,7 @@ def __get_doc_type(self, solr_type, export_format): 'catalog':'Journal Article', 'phdthesis':'Thesis', 'mastersthesis':'Thesis', 'techreport':'Report', 'intechreport':'Report', 'bookreview': 'Journal Article', 'erratum': 'Journal Article', 'obituary': 'Journal Article', - 'editorial': 'Journal Article'} + 'editorial': 'Journal Article','instrument':'Miscellaneous', 'service':'Miscellaneous'} elif (export_format == self.EXPORT_FORMAT_PROCITE): fields = {'article': 'Journal', 'book': 'Book, Whole', 'inbook': 'Book Chapter', 'proceedings': 'Journal', 'inproceedings': 'Conference', @@ -75,7 +75,8 @@ def __get_doc_type(self, solr_type, export_format): 'pressrelease':'Journal', 'circular':'Journal', 'newsletter':'Journal', 'catalog':'Journal', 'phdthesis':'Thesis/Dissertation', 'mastersthesis':'Thesis/Dissertation', 'techreport':'Report', 'intechreport':'Report', - 'bookreview': 'Journal', 'erratum': 'Journal', 'obituary': 'Journal', 'editorial': 'Journal'} + 'bookreview': 'Journal', 'erratum': 'Journal', 'obituary': 'Journal', 'editorial': 'Journal', + 'instrument':'Miscellaneous', 'service':'Miscellaneous'} elif (export_format == self.EXPORT_FORMAT_REFMAN): fields = {'article': 'JOUR', 'book': 'BOOK', 'inbook': 'CHAP', 'proceedings': 'JOUR', 'inproceedings': 'CONF', @@ -85,7 +86,8 @@ def __get_doc_type(self, solr_type, export_format): 'pressrelease':'JOUR', 'circular':'JOUR', 'newsletter':'JOUR', 'catalog':'JOUR', 'phdthesis':'Thesis/Dissertation', 'mastersthesis':'Thesis/Dissertation', 'techreport':'RPRT', 'intechreport':'RPRT', - 'bookreview': 'JOUR', 'erratum': 'JOUR', 'obituary': 'JOUR', 'editorial': 'JOUR'} + 'bookreview': 'JOUR', 'erratum': 'JOUR', 'obituary': 'JOUR', 'editorial': 'JOUR', + 'instrument':'MISC', 'service':'MISC'} elif (export_format == self.EXPORT_FORMAT_REFWORKS): fields = {'article': 'Journal', 'book': 'Book, Whole', 'inbook': 'Book, Chapter', 'proceedings': 'Journal', 'inproceedings': 'Conference Proceeding', @@ -95,7 +97,8 @@ def __get_doc_type(self, solr_type, export_format): 'pressrelease':'Journal', 'circular':'Journal', 'newsletter':'Journal', 'catalog':'Journal', 'phdthesis':'Thesis/Dissertation', 'mastersthesis':'Thesis/Dissertation', 'techreport':'Report', 'intechreport':'Report', - 'bookreview': 'Journal', 'erratum': 'Journal', 'obituary': 'Journal', 'editorial': 'Journal'} + 'bookreview': 'Journal', 'erratum': 'Journal', 'obituary': 'Journal', 'editorial': 'Journal', + 'instrument':'Generic', 'service':'Generic'} elif (export_format == self.EXPORT_FORMAT_MEDLARS): fields = {'article': 'Journal Article', 'book': 'Book', 'inbook': 'Book Chapter', 'proceedings': 'Journal Article', 'inproceedings': 'Conference', @@ -106,7 +109,7 @@ def __get_doc_type(self, solr_type, export_format): 'catalog':'Journal Article', 'phdthesis':'Thesis', 'mastersthesis':'Thesis', 'techreport':'Report', 'intechreport':'Report', 'bookreview': 'Journal Article', 'erratum': 'Journal Article', 'obituary': 'Journal Article', - 'editorial': 'Journal Article'} + 'editorial': 'Journal Article', 'instrument':'Miscellaneous', 'service':'Miscellaneous'} return fields.get(solr_type, '') diff --git a/exportsrv/formatter/xmlFormat.py b/exportsrv/formatter/xmlFormat.py index 7a43544..5b0f732 100755 --- a/exportsrv/formatter/xmlFormat.py +++ b/exportsrv/formatter/xmlFormat.py @@ -671,6 +671,7 @@ def __get_doc_jats_xml(self, index): 'editorial': 'editorial', 'newsletter': 'news', 'obituary': 'obituary', 'book': 'other', 'catalog': 'other', 'circular': 'other', 'misc': 'other', 'proposal': 'other', 'software': 'other', 'talk': 'other', 'techreport': 'other', 'dataset': 'other', + 'instrument':'other', 'service':'other' } a_doc = self.from_solr['response'].get('docs')[index] fields = self.__get_fields(self.EXPORT_FORMAT_JATS_XML)