[Treebase-guts] SF.net SVN: treebase:[317] trunk/oai-pmh_data_provider/data_provider_web/ src/main

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

Revision: 317
          http://treebase.svn.sourceforge.net/treebase/?rev=317&view=rev
Author:   youjun
Date:     2009-11-24 15:14:37 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
bug fixing on controller unpublished data will be fill out

Modified Paths:
--------------
    trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
    trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties

Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java	2009-11-24 14:02:09 UTC (rev 316)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java	2009-11-24 15:14:37 UTC (rev 317)
@@ -219,6 +219,7 @@
 			Study study=submission.getStudy();
 			Citation citation=study.getCitation();
 			String publisher=null;
+			if(!study.isPublished())return null;
 			
 			//System.out.println("ctype: "+citation.getCitationType());
 			try{
@@ -248,8 +249,7 @@
 				//study 253 citation= null, data should be fixed 
  				System.err.println("study "+study.getId()+
 						" citation= "+e.getMessage());
- 				map.put("identifier", "treebase.org/study/TB2:s"+study.getId());
- 				map.put("datestamp", study.getReleaseDate());
+ 				return null;
 			}
 			
 			//map.put("type", "text");
@@ -266,9 +266,10 @@
 		{
 			List recordList=new ArrayList<Map>();
 			
-			for(int i =0; i< sList.size(); i++)
-				recordList.add(getRecordMap(sList.get(i)));
-						
+			for(int i =0; i< sList.size(); i++){
+				Map map=getRecordMap(sList.get(i));
+				if(map!=null)recordList.add(map);
+			}
 			return recordList;
 		}
 }

Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties	2009-11-24 14:02:09 UTC (rev 316)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties	2009-11-24 15:14:37 UTC (rev 317)
@@ -1,13 +1,13 @@
 identify.baseURL=www.***.***:port/top
-identify.repositoryName=treebase repository
+identify.repositoryName=TreeBASE repository
 identify.protocolVersion=2.0
 identify.adminEmail=you...@ya...
 identify.earliestDatestamp=1995-11-04T00:00:00Z
 identify.deletedRecord=transient
 identify.granularity=YYYY-MM-DDThh:mm:ssZ
 identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z'
-identify.sampleIdentifier=treebase.org/study/TB2:s6705
-identify.repositoryIdentifier=treebase.org
+identify.sampleIdentifier=TreeBASE.org/study/TB2:s6705
+identify.repositoryIdentifier=TreeBASE.org
 identify.identifierDelimiter=:
 identify.dublinPerfix=oai_dc
 identify.dryadPerfix=dryad
\ No newline at end of file


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