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

[<yo...@us...>]

Revision: 739
          http://treebase.svn.sourceforge.net/treebase/?rev=739&view=rev
Author:   youjun
Date:     2010-07-20 15:12:46 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
handshaking process nexus

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	2010-07-16 02:32:08 UTC (rev 738)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java	2010-07-20 15:12:46 UTC (rev 739)
@@ -96,7 +96,7 @@
 			        for(int i=0; i<files.size(); i++ )
 			        	submission.getStudy().addNexusFile(files.get(i).getName(), "NEXUS");			        	
 					MyProgressionListener listener = new MyProgressionListener();
-					//getSubmissionService().addNexusFilesJDBC(submission, files, listener);
+					getSubmissionService().addNexusFilesJDBC(submission, files, listener);
 					
 					// save Study object to session					
 					//mSubmissionService.save(submission);

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-07-16 02:32:08 UTC (rev 738)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java	2010-07-20 15:12:46 UTC (rev 739)
@@ -61,7 +61,7 @@
 		if(description!=null)citation.setAbstract(description.getText());
 		
 		Node identifier = getNode(pubRoot,"identifier",dcterms);		
-		if(identifier!=null)citation.setDoi(identifier.getText());;
+		if(identifier!=null)citation.setDoi(identifier.getText().replaceAll("doi:", ""));
 		
 	    Node title = getNode(pubRoot,"title",dcterms);		
 	    if(title!=null)citation.setTitle(title.getText());
@@ -90,7 +90,13 @@
 		    String []names = al.get(i).getText().split(",");
 			if(names.length >1 ){
 				Person p = new Person ();
-				p.setFirstName(names[1]);
+				names[1]=names[1].trim();
+				if(!(names[1].contains(" ")))p.setFirstName(names[1]);
+				else {					
+					
+					p.setFirstName(names[1].trim().substring(0,names[1].indexOf(" ")));
+					p.setMiddleName(names[1].trim().substring(names[1].indexOf(" ")));
+				}
 				p.setLastName(names[0]);
 				citation.addAuthor(p);
 			}


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