Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[299] trunk/oai-pmh_data_provider/data_provider_web/ src
|
From: <yo...@us...> - 2009-11-23 21:46:11
|
Revision: 299
http://treebase.svn.sourceforge.net/treebase/?rev=299&view=rev
Author: youjun
Date: 2009-11-23 21:45:55 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
fix bug on test template
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/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm
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-23 19:25:47 UTC (rev 298)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-23 21:45:55 UTC (rev 299)
@@ -247,7 +247,10 @@
}catch(NullPointerException e){
//study 253 citation= null, data should be fixed
System.err.println("study "+study.getId()+
- " citation= "+e.getMessage());}
+ " citation= "+e.getMessage());
+ map.put("identifier", "treebase.org/study/TB2:s"+study.getId());
+ map.put("datestamp", study.getReleaseDate());
+ }
//map.put("type", "text");
//map.put("language", "en");
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-23 19:25:47 UTC (rev 298)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-23 21:45:55 UTC (rev 299)
@@ -155,12 +155,11 @@
}
-public void testListRecords() {
-
+public void testListRecords() {
OAIPMHCommand params=new OAIPMHCommand();
params.setVerb("ListRecords");
- //params.setFrom("2005-11-15T06:16:15Z");
- params.setUntil("1996-11-04T06:16:15Z");
+ params.setFrom("2008-05-05T01:01:01Z");
+ //params.setUntil("1996-11-04T06:16:15Z");
params.setMetadataPrefix("oai_dc");
Map model=new HashMap();
model.put("identify",identify );
@@ -168,14 +167,12 @@
ModelAndView mav=controller.ListRecords(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- //System.out.println("---------test ListRecord---------");
- //System.out.print(result);
-
+ System.out.println("---------test ListRecord---------");
+ System.out.print(result);
}
public void testListIdentifiers()
- {
-
+ {
OAIPMHCommand params=new OAIPMHCommand();
params.setVerb("ListIdentifiers");
params.setFrom("2005-11-15T06:16:15Z");
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm 2009-11-23 19:25:47 UTC (rev 298)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm 2009-11-23 21:45:55 UTC (rev 299)
@@ -1,6 +1,7 @@
#parse("head.vm")
<GetRecord>
#if($!model.params.metadataPrefix=="oai_dc")
+#set($record=$model.record)
#parse("oai_dc_record.vm")
#end
</GetRecord>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm 2009-11-23 19:25:47 UTC (rev 298)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm 2009-11-23 21:45:55 UTC (rev 299)
@@ -1,7 +1,7 @@
<record>
<header>
- <identifier>${model.record.identifier}</identifier>
- <datestamp>$!model.record.datestamp</datestamp>
+ <identifier>${record.identifier}</identifier>
+ <datestamp>$!record.datestamp</datestamp>
</header>
<metadata>
<oai_dc:dc
@@ -10,52 +10,52 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- #if($model.record.title)
- <dc:title>${model.record.title}</dc:title>
+ #if($record.title)
+ <dc:title>${record.title}</dc:title>
#end
- #if($model.record.creator)
- #foreach ($person in $model.record.creator)
+ #if($record.creator)
+ #foreach ($person in $record.creator)
<dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
#end
#end
- #if($model.record.subject)
- <dc:subject>${model.record.subject}</dc:subject>
+ #if($record.subject)
+ <dc:subject>${record.subject}</dc:subject>
#end
- #if($model.record.description)
- <dc:description>${model.record.description}</dc:description>
+ #if($record.description)
+ <dc:description>${record.description}</dc:description>
#end
- #if($model.record.publisher)
- <dc:publisher>${model.record.publisher}</dc:publisher>
+ #if($record.publisher)
+ <dc:publisher>${record.publisher}</dc:publisher>
#end
- #if($model.record.contributor)
- <dc:contributor>${model.record.contributor}</dc:contributor>
+ #if($record.contributor)
+ <dc:contributor>${record.contributor}</dc:contributor>
#end
- #if($model.record.date)
- <dc:date>${model.record.date}</dc:date>
+ #if($record.date)
+ <dc:date>${record.date}</dc:date>
#end
- #if($model.record.type)
- <dc:type>${model.record.type}</dc:type>
+ #if($record.type)
+ <dc:type>${record.type}</dc:type>
#end
- #if($model.record.format)
- <dc:format>${model.record.format}</dc:format>
+ #if($record.format)
+ <dc:format>${record.format}</dc:format>
#end
-##if($model.record.identifier)
-##<dc:identifier>${model.record.identifier}</dc:identifier>
+##if($record.identifier)
+##<dc:identifier>${record.identifier}</dc:identifier>
##end
- #if($model.record.source)
- <dc:source>{model.record.source}</dc:source>
+ #if($record.source)
+ <dc:source>{record.source}</dc:source>
#end
- #if($model.record.language)
- <dc:language>${model.record.language}</dc:language>
+ #if($record.language)
+ <dc:language>${record.language}</dc:language>
#end
- #if($model.record.relation)
- <dc:relation>${model.record.relation}</dc:relation>
+ #if($record.relation)
+ <dc:relation>${record.relation}</dc:relation>
#end
- #if($model.record.coverage)
- <dc:coverage>${model.record.coverage}</dc:coverage>
+ #if($record.coverage)
+ <dc:coverage>${record.coverage}</dc:coverage>
#end
- #if($model.record.rights)
- <dc:rights>${model.record.rights}</dc:rights>
+ #if($record.rights)
+ <dc:rights>${record.rights}</dc:rights>
#end
</oai_dc:dc>
</metadata>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
