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

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

Revision: 230
          http://treebase.svn.sourceforge.net/treebase/?rev=230&view=rev
Author:   youjun
Date:     2009-11-02 00:15:50 +0000 (Mon, 02 Nov 2009)

Log Message:
-----------


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/top-servlet.xml
    trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/controller/OAIPMHController.class

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-01 22:31:20 UTC (rev 229)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java	2009-11-02 00:15:50 UTC (rev 230)
@@ -11,11 +11,17 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractCommandController;
 import org.treebase.oai.web.command.OAIPMHCommand;
+import org.cipres.treebase.domain.study.SubmissionService;
+import org.cipres.treebase.domain.study.StudyService;
 
 public class OAIPMHController extends AbstractCommandController{
-
-	 public OAIPMHController(){
+   
+	private SubmissionService submissionService;
+	private StudyService studyService;
+	
+	public OAIPMHController(){
 		  setCommandClass(OAIPMHCommand.class);
+		  setCommandName("params");
 		 }
 	
 	@Override
@@ -26,7 +32,7 @@
 		
 		 OAIPMHCommand params = (OAIPMHCommand) command;
 		 
-		 Map  model=new  HashMap();
+		 Map  model=errors.getModel();
 		 model.put("params", params);
 		 
 		 Method method=null;
@@ -43,38 +49,40 @@
 		}
 
 		ModelAndView ListRecoed(HttpServletRequest request, HttpServletResponse response, Map model){
+			
+			return (new ModelAndView(metadataPrefix+"_ListRecoed.vm",model));
 		
-			return null;
-		
 		}
     
-		ModelAndView ListMetadataFormats(HttpServletRequest request, HttpServletResponse response, Map model){
 		
-			return null;
-		
-		}
 
 		ModelAndView ListIdentifiers(HttpServletRequest request, HttpServletResponse response, Map model){
+			metadataPrefix
+			return (new ModelAndView(metadataPrefix+"_ListIdentifiers.vm",model));
 	
-			return null;
-	
 		}
 
 		ModelAndView GetRecord(HttpServletRequest request, HttpServletResponse response, Map model){
+			metadataPrefix
+			return (new ModelAndView(metadataPrefix+"_GetRecord.vm",model));
 	
-			return null;
-	
 		}
 
 		ModelAndView Identify(HttpServletRequest request, HttpServletResponse response, Map model){
 	
-			return null;
+			return (new ModelAndView("Identify.vm",model));
 	
 		}
 		
 		ModelAndView ListSet(HttpServletRequest request, HttpServletResponse response, Map model){
 			
-			 return null;
+			 return (new ModelAndView("ListSet.vm",model));
 			
 		}
+		
+		ModelAndView ListMetadataFormats(HttpServletRequest request, HttpServletResponse response, Map model){
+		
+			return (new ModelAndView("ListMetadataFormats.vm",model));
+		
+		}
 }

Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml	2009-11-01 22:31:20 UTC (rev 229)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml	2009-11-02 00:15:50 UTC (rev 230)
@@ -19,12 +19,13 @@
     </bean>
 	
 	<!-- ========================================================== -->
-	<!-- LIST OF CONTROLLERS FOR VERBS AND FORMATS							-->
+	<!-- LIST OF CONTROLLERS FOR OAI-PMH							-->
 	<!-- ========================================================== -->
 	
-	 <!--bean id="appletInteractionController" class="org.cipres.treebase.web.controllers.AppletInteractionController">
-		<property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
-	</bean-->
+	 <bean id="OAIPMHController" class="org.treebase.oai.web.controller.OAIPMHController">
+		<property name="submissionService"><ref bean="submissionService"></ref></property>
+		<property name="studyService"><ref bean="studyphyloTreeService"></ref></property>
+	</bean>
 	
  
 	<!-- ========================================================== -->
@@ -62,7 +63,7 @@
 		<property name="alwaysUseFullPath" value="true"/>
 			<property name="mappings">
 			<props>	
-				<!--prop key="/oai-pmh verbs/metadata formats/paramaters</prop-->			       		
+				<prop key="/top/**">OAIPMHController</prop>			       		
 			</props>
 		</property>
 	</bean>

Modified: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/controller/OAIPMHController.class
===================================================================
(Binary files differ)


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