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

[<vga...@us...>]

Revision: 762
          http://treebase.svn.sourceforge.net/treebase/?rev=762&view=rev
Author:   vgapeyev
Date:     2010-11-18 19:55:46 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
Putative fix: accept "*.nex" as well as "*.nexus" files in Dryad submissions

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.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 19:20:00 UTC (rev 761)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java	2010-11-18 19:55:46 UTC (rev 762)
@@ -101,8 +101,6 @@
 			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++) {

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java	2010-11-18 19:20:00 UTC (rev 761)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java	2010-11-18 19:55:46 UTC (rev 762)
@@ -29,7 +29,8 @@
 			 
 			 File[] nexus = files[i].listFiles(new FilenameFilter() {
 		            public boolean accept(File file, String name) {
-		            boolean ret = (name.endsWith("nexus")); 
+		            boolean ret = name.endsWith("nexus")
+		            		   || name.endsWith("nex"); 
 		            return ret;
 		     }});
 			 


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