Merge pull request #248 from golnazads/master

moved publisher for xml abstract format to between origin and copyright

exportsrv/formatter/xmlFormat.py

@@ -353,10 +353,10 @@ def __get_fields(self, export_format):
             fields = [('bibcode', 'bibcode'), ('title', 'title'), ('author', 'author'),
                       ('aff', 'affiliation'), ('pub_raw', 'journal'), ('volume', 'volume'),
                       ('pubdate', 'pubdate'), ('page', 'page'), ('page_range', 'lastpage'),
-                      ('keyword', 'keywords'), ('', 'origin'), ('copyright', 'copyright'),
-                      ('link', 'link'), ('url', 'url'), ('comment', 'comment'),
-                      ('', 'score'), ('num_citations', 'citations'), ('abstract', 'abstract'),
-                      ('doi', 'DOI'), ('eprintid', 'eprintid'), ('publisher', 'publisher')]
+                      ('keyword', 'keywords'), ('', 'origin'), ('publisher', 'publisher'),
+                      ('copyright', 'copyright'), ('link', 'link'), ('url', 'url'),
+                      ('comment', 'comment'), ('', 'score'), ('num_citations', 'citations'),
+                      ('abstract', 'abstract'), ('doi', 'DOI'), ('eprintid', 'eprintid')]
         elif (export_format == self.EXPORT_FORMAT_DUBLIN_XML):
             fields = [('bibcode', 'dc:identifier'), ('title', 'dc:title'), ('author', 'dc:creator'),
                       ('pub_raw', 'dc:source'), ('pubdate', 'dc:date'), ('keyword', 'dc:subject'),

exportsrv/tests/unittests/test_export_service.py

@@ -99,7 +99,6 @@ def test_dublinxml(self):
     def test_refxml(self):
         # format the stubdata using the code
         xml_export = XMLFormat(solrdata.data).get_reference_xml(include_abs=False)
-        print(xml_export)
         # now compare it with an already formatted data that we know is correct
         assert(xml_export == xmlTest.data_ref)