[Treebase-guts] SF.net SVN: treebase:[930] trunk/treebase-web/src/main/java/org/cipres/ treebase/web

[<hs...@us...>]

Revision: 930
          http://treebase.svn.sourceforge.net/treebase/?rev=930&view=rev
Author:   hshyket
Date:     2011-07-19 19:29:36 +0000 (Tue, 19 Jul 2011)

Log Message:
-----------
Changing the way that Dryad submissions put data into the fields.  The title of the paper in Dryad is now the study name and the dryad submission number is prefixed to the notes.  The URL field is now prepopulated with the data DOI

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java	2011-07-18 21:56:02 UTC (rev 929)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java	2011-07-19 19:29:36 UTC (rev 930)
@@ -90,13 +90,18 @@
 			        CitationParser cparser= new CitationParser(dataPath);
 			        Citation citation = cparser.getCitation();
 					Study study = new Study();
-					study.setName(bagitPath.getName());
+					//study.setName(bagitPath.getName());
+					study.setName(citation.getTitle());
+				
 					study.setCitation(citation);
 			        citation.setStudy(study);
 
-					study.setNotes("Please enter these author names into the TreeBASE citation " +
+					study.setNotes(bagitPath.getName() +
+								   ": Please enter these author names into the TreeBASE citation " +
 		 					 	   "by clicking on the highlighted \"Authors\" item in the Tool Box." +
 		 					 	   "\n\n" + citation.getAuthorsDryadNotes());
+					
+					
 
 					citation.setAuthors(null);		
 			            

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-18 21:56:02 UTC (rev 929)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java	2011-07-19 19:29:36 UTC (rev 930)
@@ -101,6 +101,12 @@
 			citation.setPages(pageStart.getText() + "-" + pageEnd.getText()); 
 //end VG 2010-11-18		
 		
+		//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());
+		}
+
 		List<Node> kl = getNodes(pkgRoot,"subject",dcterms);
 		String keywords="";
 		for(int i = 0; i<kl.size(); i++) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.