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

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

Revision: 737
          http://treebase.svn.sourceforge.net/treebase/?rev=737&view=rev
Author:   youjun
Date:     2010-07-16 01:36:17 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
handshaking, add study name, enable parser elements without namespace 

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 00:12:57 UTC (rev 736)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java	2010-07-16 01:36:17 UTC (rev 737)
@@ -87,7 +87,7 @@
 			        CitationParser cparser= new CitationParser(dataPath);
 			        Citation citation = cparser.getCitation();
 					Study study = new Study();
-					
+					study.setName(bagitPath.getName());
 					study.setCitation(citation);					
 			        citation.setStudy(study);					
 					Submission submission = mSubmissionService.createSubmission(user, study);

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 00:12:57 UTC (rev 736)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java	2010-07-16 01:36:17 UTC (rev 737)
@@ -113,7 +113,7 @@
 	}
 
 	private Node getNode(Element root, String localName, Namespace namespace){
-        if(namespace==null)return root.element(new QName(localName));
+        if(namespace==null)return root.element(localName);
 		return root.element(new QName(localName, namespace));
 	}
 


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