From: <vga...@us...> - 2010-11-18 19:20:07
|
Revision: 761 http://treebase.svn.sourceforge.net/treebase/?rev=761&view=rev Author: vgapeyev Date: 2010-11-18 19:20:00 +0000 (Thu, 18 Nov 2010) Log Message: ----------- putative fix for SF:3089438 - extracting journal name from bagit metadata (need trebase-dev to test) Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-11-18 15:46:06 UTC (rev 760) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-11-18 19:20:00 UTC (rev 761) @@ -19,7 +19,10 @@ private static final Namespace xs = new Namespace("xs","http://www.w3.org/2001/XMLSchema"); private static final Namespace dwc= new Namespace("dwc", "http://rs.tdwg.org/dwc/terms/"); private static final Namespace dcterms= new Namespace("dcterms", "http://purl.org/dc/terms/"); - private static final Namespace prism= new Namespace("prism", "http://prismstandard.org/namespaces/basic/2.0/"); + + //VG 2010-11-18 fixing SF:3089438 - extracting journal name from bagit metadata + //-- private static final Namespace prism= new Namespace("prism", "http://prismstandard.org/namespaces/basic/2.0/"); + private static final Namespace bibo = new Namespace("bibo", "http://purl.org/ontology/bibo/"); private Element pubRoot; private Element pkgRoot; @@ -66,7 +69,9 @@ Node title = getNode(pubRoot,"title",dcterms); if(title!=null)citation.setTitle(title.getText()); - Node issueIdentifier = getNode(pubRoot,"issueIdentifier",prism); +//VG 2010-11-18 fixing SF:3089438 - extracting journal name from bagit metadata +/*-- + Node issueIdentifier = getNode(pubRoot,"issueIdentifier",prism); if(issueIdentifier!=null)citation.setIssue(issueIdentifier.getText()); Node publicationName = getNode(pubRoot,"publicationName",prism); @@ -77,7 +82,27 @@ Node pageRange = getNode(pubRoot,"pageRange",prism); if(pageRange!=null)citation.setPages(pageRange.getText()); - +*/ + Node journal = getNode(pubRoot,"Journal",bibo); + if (journal!=null) citation.setJournal(journal.getText()); + + Node volume = getNode(pubRoot,"volume",bibo); + if (volume!=null) citation.setVolume(volume.getText()); + + Node issue = getNode(pubRoot,"Issue",bibo); + if (issue!=null) citation.setIssue(issue.getText()); + + Node pages = getNode(pubRoot,"pages",bibo); + Node pageStart = getNode(pubRoot,"pageStart",bibo); + Node pageEnd = getNode(pubRoot,"pageEnd",bibo); + if (pages != null) + citation.setPages(pages.getText()); + else if (pageStart != null && pageEnd != null) + citation.setPages(pageStart.getText() + "-" + pageEnd.getText()); +//end VG 2010-11-18 + + + List<Node> kl = getNodes(pkgRoot,"subject",dcterms); String keywords=""; for(int i = 0; i<kl.size(); i++) { @@ -103,8 +128,8 @@ } try{ - int issue = Integer.parseInt(getNode(pubRoot,"issued",dcterms).getText()); - citation.setPublishYear(issue); + int issued = Integer.parseInt(getNode(pubRoot,"issued",dcterms).getText()); + citation.setPublishYear(issued); }catch(Exception e){ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hs...@us...> - 2011-07-19 19:37:51
|
Revision: 931 http://treebase.svn.sourceforge.net/treebase/?rev=931&view=rev Author: hshyket Date: 2011-07-19 19:37:41 +0000 (Tue, 19 Jul 2011) Log Message: ----------- Fixing issue with last commit where the doi: was not being replaced out of the URL. Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2011-07-19 19:29:36 UTC (rev 930) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2011-07-19 19:37:41 UTC (rev 931) @@ -104,7 +104,7 @@ //set the URL to use the DOI passed by Dryad Node doiUrl = getNode(pkgRoot,"identifier",dcterms); if (doiUrl!=null) { - citation.setURL("http://dx.doi.org/" + doiUrl.getText()); + citation.setURL("http://dx.doi.org/" + doiUrl.getText().replaceAll("doi:", "")); } List<Node> kl = getNodes(pkgRoot,"subject",dcterms); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |