Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[285] trunk/oai-pmh_data_provider/data_provider_web
|
From: <yo...@us...> - 2009-11-19 02:14:06
|
Revision: 285
http://treebase.svn.sourceforge.net/treebase/?rev=285&view=rev
Author: youjun
Date: 2009-11-19 02:13:56 +0000 (Thu, 19 Nov 2009)
Log Message:
-----------
fix templates variable name
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/.classpath
trunk/oai-pmh_data_provider/data_provider_web/pom.xml
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/validator/OAIPMHValidator.java
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm
Modified: trunk/oai-pmh_data_provider/data_provider_web/.classpath
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-19 02:13:56 UTC (rev 285)
@@ -11,5 +11,6 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="lib" path="C:/Documents and Settings/youjun/.m2/repository/org/cipres/treebase/treebase-core/1.0-SNAPSHOT/treebase-core-1.0-SNAPSHOT.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/oai-pmh_data_provider/data_provider_web/pom.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/pom.xml 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/pom.xml 2009-11-19 02:13:56 UTC (rev 285)
@@ -246,11 +246,6 @@
<version>2.4</version>
</dependency>
<dependency>
- <groupId>org.cipres.treebase</groupId>
- <artifactId>treebase-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
@@ -265,6 +260,11 @@
<artifactId>velocity-tools-view</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.cipres.treebase</groupId>
+ <artifactId>treebase-core</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<dependencyManagement>
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-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-19 02:13:56 UTC (rev 285)
@@ -85,17 +85,17 @@
if(errors.hasFieldErrors("metadataPrefix")){
model.put("error_code", "cannotDisseminateFormat");
model.put("error", "bad metadataPrefix");
- return new ModelAndView("error.vm",model);
+ return new ModelAndView("error",model);
}
if(errors.hasFieldErrors("verb")){
model.put("error_code", "badVerb");
model.put("error", "no verb was found");
- return new ModelAndView("error.vm",model);
+ return new ModelAndView("error",model);
}
if(errors.hasFieldErrors("identifier")){
model.put("error_code", "idDoesNotExist");
model.put("error", "no id was found");
- return new ModelAndView("error.vm",model);
+ return new ModelAndView("error",model);
}
}
@@ -105,11 +105,11 @@
}catch(NoSuchMethodException nsme){
model.put("error_code", "badVerb");
model.put("error", "invalid verb");
- return new ModelAndView("error.vm",model);
+ return new ModelAndView("error",model);
}catch(NullPointerException e){
model.put("error_code", "badVerb");
model.put("error", "missing verb");
- return (new ModelAndView("error.vm",model));
+ return (new ModelAndView("error",model));
}
return (ModelAndView) method.invoke(this, params, model);
@@ -125,10 +125,10 @@
} catch (ParseException e) {
model.put("error_code", "badArgument");
model.put("error", "invalid from or until format");
- return (new ModelAndView("error.vm",model));
+ return (new ModelAndView("error",model));
}
model.put("recordList", getRecordList(list));
- return (new ModelAndView("ListRecords.vm",model));
+ return (new ModelAndView("ListRecords",model));
}
@@ -142,10 +142,10 @@
} catch (ParseException e) {
model.put("error_code", "badArgument");
model.put("error", "invalid from or until format");
- return (new ModelAndView("error.vm",model));
+ return (new ModelAndView("error",model));
}
model.put("recordList", getRecordList(list));
- return (new ModelAndView(params.getMetadataPrefix()+"_ListIdentifiers.vm",model));
+ return (new ModelAndView(params.getMetadataPrefix()+"_ListIdentifiers",model));
}
@@ -159,32 +159,32 @@
}catch(NumberFormatException nfe){
model.put("error_code", "badArgument");
model.put("error", "invalid id format");
- return (new ModelAndView("error.vm",model));
+ return (new ModelAndView("error",model));
}
catch (NullPointerException e){
model.put("error_code", "idDoesNotExist");
model.put("error", "invalid id");
- return (new ModelAndView("error.vm",model));
+ return (new ModelAndView("error",model));
}
model.put("record", getRecordMap(submission));
- return (new ModelAndView("GetRecord.vm",model));
+ return (new ModelAndView("GetRecord",model));
}
public ModelAndView Identify(OAIPMHCommand params, Map model){
- return (new ModelAndView("Identify.vm",model));
+ return (new ModelAndView("Identify",model));
}
public ModelAndView ListSets(OAIPMHCommand params, Map model){
model.put("error_code", "noSetHierarchy");
model.put("error", "This repository does not support sets");
- return (new ModelAndView("error.vm",model));
+ return (new ModelAndView("error",model));
}
@@ -198,16 +198,16 @@
}catch(NumberFormatException nfe){
model.put("error_code", "badArgument");
model.put("error", "invalid id format");
- return (new ModelAndView("error.vm",model));
+ return (new ModelAndView("error",model));
}
catch (NullPointerException e){
//id is optional for ListMetadataFormats
- //return (new ModelAndView("idDoesNotExist.vm",model));
+ //return (new ModelAndView("error",model));
}
- return (new ModelAndView("ListMetadataFormats.vm",model));
+ return (new ModelAndView("ListMetadataFormats",model));
}
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java 2009-11-19 02:13:56 UTC (rev 285)
@@ -24,10 +24,11 @@
// check format prefix
- if(verb=="GetRecord"||verb=="ListIdentifiers"||verb=="ListRecords")
- if(fPrefix!="oai_dc"&fPrefix!="dryad")
- pError.rejectValue("metadataPrefix","cannotDisseminateFormat");
-
+ if(verb=="GetRecord"||verb=="ListIdentifiers"||verb=="ListRecords"){
+ ValidationUtils.rejectIfEmptyOrWhitespace(pError, "metadataPrefix", "cannotDisseminateFormat");
+ if(fPrefix!="oai_dc"&fPrefix!="dryad")
+ pError.rejectValue("metadataPrefix","cannotDisseminateFormat");
+ }
}
}
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm 2009-11-19 02:13:56 UTC (rev 285)
@@ -1,6 +1,6 @@
#parse("head.vm")
<GetRecord>
-#if($!model.params.metadataPrefix=="oai_dc")
+#if($!requestParams.metadataPrefix=="oai_dc")
#parse("oai_dc_record.vm")
#end
</GetRecord>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm 2009-11-19 02:13:56 UTC (rev 285)
@@ -1,12 +1,12 @@
#parse("head.vm")
<Identify>
- <repositoryName>${model.identify.repositoryName}</repositoryName>
- <baseURL>${model.identify.baseURL}</baseURL>
- <protocolVersion>${model.identify.protocolVersion}</protocolVersion>
- <adminEmail>${model.identify.adminEmail}</adminEmail>
- <earliestDatestamp>${model.identify.earliestDatestamp}</earliestDatestamp>
- <deletedRecord>${model.identify.deletedRecord}</deletedRecord>
- <granularity>${model.identify.granularity}</granularity>
+ <repositoryName>${identify.repositoryName}</repositoryName>
+ <baseURL>${identify.baseURL}</baseURL>
+ <protocolVersion>${identify.protocolVersion}</protocolVersion>
+ <adminEmail>${identify.adminEmail}</adminEmail>
+ <earliestDatestamp>${identify.earliestDatestamp}</earliestDatestamp>
+ <deletedRecord>${identify.deletedRecord}</deletedRecord>
+ <granularity>${identify.granularity}</granularity>
<description>
<oai-identifier
@@ -16,9 +16,9 @@
"http://www.openarchives.org/OAI/2.0/oai-identifier
http://www.openarchives.org/OAI/2.0/oai-identifier.xsd">
<scheme>oai</scheme>
- <repositoryIdentifier>${model.identify.repositoryIdentifier}</repositoryIdentifier>
- <delimiter>${model.identify.identifierDelimiter}</delimiter>
- <sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
+ <repositoryIdentifier>${identify.repositoryIdentifier}</repositoryIdentifier>
+ <delimiter>${identify.identifierDelimiter}</delimiter>
+ <sampleIdentifier>${identify.sampleIdentifier}</sampleIdentifier>
</oai-identifier>
</description>
</Identify>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm 2009-11-19 02:13:56 UTC (rev 285)
@@ -1,7 +1,7 @@
#parse("head.vm")
<ListRecords>
-#if($!model.params.metadataPrefix=="oai_dc")
-#foreach($record in $model.recordList)
+#if($!requestParams.metadataPrefix=="oai_dc")
+#foreach($record in $recordList)
#parse("oai_dc_record.vm")
#end
#end
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm 2009-11-19 02:13:56 UTC (rev 285)
@@ -1,3 +1,3 @@
#parse("head.vm")
-<error code="$!model.error_code">$!model.error</error>
+<error code="$!error_code">$!error</error>
</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm 2009-11-19 02:13:56 UTC (rev 285)
@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
-<responseDate>${model.identify.getResponseDate()}</responseDate>
-<request #if($!model.params.verb)verb="$!model.params.verb" #end
-#if($!model.params.identifier)identifier="$!model.params.identifier" #end
-#if($!model.params.metadataPrefix)metadataPrefix="$!model.params.metadataPrefix" #end
-#if($!model.params.from)from="$!model.params.from" #end
-#if($!model.params.until)until="$!model.params.until" #end
-#if($!model.params.resumptionToken)resumptionToken="$!model.params.resumptionToken" #end
-#if($!model.params.set)set="$!model.params.set" #end>
-$!model.identify.BaseURL</request>
+<responseDate>${identify.getResponseDate()}</responseDate>
+<request #if($!requestParams.verb)verb="$!requestParams.verb" #end
+#if($!requestParams.identifier)identifier="$!requestParams.identifier" #end
+#if($!requestParams.metadataPrefix)metadataPrefix="$!requestParams.metadataPrefix" #end
+#if($!requestParams.from)from="$!requestParams.from" #end
+#if($!requestParams.until)until="$!requestParams.until" #end
+#if($!requestParams.resumptionToken)resumptionToken="$!requestParams.resumptionToken" #end
+#if($!requestParams.set)set="$!requestParams.set" #end>
+$!identify.BaseURL</request>
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm 2009-11-19 02:13:56 UTC (rev 285)
@@ -1,6 +1,6 @@
#parse("head.vm")
<ListIdentifiers>
-#foreach ( $record in $model.recordList)
+#foreach ( $record in $recordList)
<header>
<identifier>${record.identifier}</identifier>
<datestamp>$!record.datestamp</datestamp>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm 2009-11-18 21:08:06 UTC (rev 284)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm 2009-11-19 02:13:56 UTC (rev 285)
@@ -1,62 +1,64 @@
<record>
- <header>
- <identifier>${model.record.identifier}</identifier>
- <datestamp>$!model.record.datestamp</datestamp>
- </header>
- <metadata>
- <oai_dc:dc
- xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- 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>
- #end
- #if($model.record.creator)
- #foreach ($person in $model.record.creator)
- <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
- #end
- #end
- #if($model.record.subject)
- <dc:subject>${model.record.subject}</dc:subject>
- #end
- #if($model.record.description)
- <dc:description>${model.record.description}</dc:description>
- #end
- #if($model.record.publisher)
- <dc:publisher>${model.record.publisher}</dc:publisher>
- #end
- #if($model.record.contributor)
- <dc:contributor>${model.record.contributor}</dc:contributor>
- #end
- #if($model.record.date)
- <dc:date>${model.record.date}</dc:date>
- #end
- #if($model.record.type)
- <dc:type>${model.record.type}</dc:type>
- #end
- #if($model.record.format)
- <dc:format>${model.record.format}</dc:format>
+<header>
+<identifier>${record.identifier}</identifier>
+<datestamp>$!record.datestamp</datestamp>
+</header>
+<metadata>
+<oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ 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($record.title)
+<dc:title>${record.title}</dc:title>
+#end
+#if($record.creator)
+#foreach ($person in $record.creator)
+<dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
#end
-##if($model.record.identifier)
-##<dc:identifier>${model.record.identifier}</dc:identifier>
+#end
+#if($record.subject)
+<dc:subject>${record.subject}</dc:subject>
+#end
+#if($record.description)
+<dc:description>${record.description}</dc:description>
+#end
+#if($record.publisher)
+<dc:publisher>${record.publisher}</dc:publisher>
+#end
+#if($record.contributor)
+<dc:contributor>${record.contributor}</dc:contributor>
+#end
+#if($record.date)
+<dc:date>${record.date}</dc:date>
+#end
+#if($record.type)
+<dc:type>${record.type}</dc:type>
+#end
+#if($record.format)
+<dc:format>${record.format}</dc:format>
+
+#end
+##if($record.identifier)
+##<dc:identifier>${record.identifier}</dc:identifier>
##end
- #if($model.record.source)
- <dc:source>{model.record.source}</dc:source>
- #end
- #if($model.record.language)
- <dc:language>${model.record.language}</dc:language>
- #end
- #if($model.record.relation)
- <dc:relation>${model.record.relation}</dc:relation>
- #end
- #if($model.record.coverage)
- <dc:coverage>${model.record.coverage}</dc:coverage>
- #end
- #if($model.record.rights)
- <dc:rights>${model.record.rights}</dc:rights>
- #end
- </oai_dc:dc>
- </metadata>
- </record>
\ No newline at end of file
+
+#if($record.source)
+<dc:source>{record.source}</dc:source>
+#end
+#if($record.language)
+<dc:language>${record.language}</dc:language>
+#end
+#if($record.relation)
+<dc:relation>${record.relation}</dc:relation>
+#end
+#if($record.coverage)
+<dc:coverage>${record.coverage}</dc:coverage>
+#end
+#if($record.rights)
+<dc:rights>${record.rights}</dc:rights>
+#end
+</oai_dc:dc>
+</metadata>
+</record>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
