Changeset 1517 for MDService2
- Timestamp:
- 09/05/11 10:41:34 (13 years ago)
- Location:
- MDService2/branches/MDService_simple3/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java
r1512 r1517 405 405 } 406 406 407 if ( format.equals("xml")) {407 if (getFormat().equals("xml")) { 408 408 resultStream = sourceStream; 409 409 }else { -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Query.java
r1511 r1517 31 31 32 32 public class Query { 33 public static String COLLECTION S = "collections";33 public static String COLLECTION = "collection"; 34 34 public static String COLUMNS = "columns"; 35 35 public static String MODEL = "model"; … … 358 358 if (type.equals(MODEL)) { 359 359 targetRequest = fromCMDIndex2Xpath() + "&maxdepth=" + getMaxdepth() ; /* + "&maxdepth=" + getMaxdepth() ); "&collection=" + getCollection() + */ 360 } 361 else if (type.equals(COLLECTION)) { 362 targetRequest = getCollection() + "&maxdepth=" + getMaxdepth() ; /* + "&maxdepth=" + getMaxdepth() ); "&collection=" + getCollection() + */ 363 360 364 } else if (type.equals(SRUEXTERN)) { 361 365 targetRequest = "";//fromCMDIndex2Xpath() + "&maxdepth=" + getMaxdepth() ; /* + "&maxdepth=" + getMaxdepth() ); "&collection=" + getCollection() + */ -
MDService2/branches/MDService_simple3/src/struts.xml
r1511 r1517 8 8 <constant name="struts.devMode" value="false" /> 9 9 <constant name="struts.serve.static" value="false"/> 10 11 10 12 11 <package name="basicstruts2" extends="struts-default"> 13 14 <default-action-ref name="catchall" /> 15 12 <default-action-ref name="catchall" /> 16 13 <global-results> 17 14 <!-- <result name="exception">/Exception.jsp</result>--> … … 36 33 </global-exception-mappings> 37 34 38 <!-- If no class attribute is specified the framework will assume success and 39 render the result index.jsp --> 35 <!-- If no class attribute is specified the framework will assume success and render the result index.jsp --> 40 36 <!-- If no name value for the result node is specified the success value is the default --> 41 <!-- <action name="index"> 42 <result>/index.jsp</result> 43 </action> 44 45 46 <action name="/?*"> 47 <result>/index.jsp?{1}</result> 48 </action> 49 --> 50 <!-- <action name="/?*" class="eu.clarin.cmdi.mdservice.action.StaticAction" method="execute"> 51 <param name="actionkey">static</param> 52 <param name="format">htmlpage</param> 53 <param name="q">index</param> 54 <result type="stream"> 55 <param name="contentType">${getActionContentType()}</param> 56 <param name="inputName">resultStream</param> 57 </result> 58 </action> 59 --> 37 <!-- <action name="index"><result>/index.jsp</result></action> --> 38 <!-- BASIC ACTIONS --> 60 39 <action name="index" class="eu.clarin.cmdi.mdservice.action.StaticAction" method="execute"> 61 40 <param name="actionkey">static</param> … … 87 66 </result> 88 67 </action> 89 90 68 69 <!-- REPO ACTIONS --> 70 <action name="model/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 71 <param name="q">{1}</param> 72 <param name="actionkey">model</param> 73 <result type="stream"> 74 <param name="contentType">${getActionContentType()}</param> 75 <param name="inputName">resultStream</param> 76 </result> 77 </action> 78 79 <action name="search/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 80 <param name="q">{*}</param> 81 <param name="actionkey">search</param> 82 <result type="stream"> 83 <param name="contentType">${getActionContentType()}</param> 84 <param name="inputName">resultStream</param> 85 </result> 86 </action> 87 88 <action name="record" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 89 <param name="actionkey">record</param> 90 <result type="stream"> 91 <param name="contentType">${getActionContentType()}</param> 92 <param name="inputName">resultStream</param> 93 </result> 94 </action> 95 96 <action name="collection" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 97 <param name="actionkey">collection</param> 98 <result type="stream"> 99 <param name="contentType">${getActionContentType()}</param> 100 <param name="inputName">resultStream</param> 101 </result> 102 </action> 103 104 <action name="sru" class="eu.clarin.cmdi.mdservice.action.SRUAction" method="execute"> 105 <param name="q">{1}</param> 106 <result name="success" type="stream"> 107 <param name="contentType">text/xml</param> 108 <param name="inputName">resultStream</param> 109 </result> 110 <result name="error" type="stream"> 111 <param name="contentType">text/xml</param> 112 <param name="inputName">${getDiagnosticStreamName()}</param> 113 </result> 114 </action> 115 116 <action name="pazpar2/" class="eu.clarin.cmdi.mdservice.action.Pz2Action" method="execute"> 117 <result name="success" type="stream"> 118 <param name="contentType">${getActionContentType()}</param> 119 <param name="inputName">resultStream</param> 120 </result> 121 </action> 122 123 <!-- REGISTRY PROXY ACTIONS --> 91 124 <action name="comp/*" class="eu.clarin.cmdi.mdservice.action.CompRegistryProxyAction" method="execute"> 92 125 <param name="compid">{1}</param> … … 142 175 </result> 143 176 </action> 144 177 178 <!-- SPECIAL ACTIONS - Workspace(save), VirtualCollection(publish), Admin(cache) --> 145 179 <action name="workspaceprofile/*" class="eu.clarin.cmdi.mdservice.action.WorkspaceAction" method="execute"> 146 180 <param name="format">JSON</param> … … 161 195 <param name="type">{1}</param> 162 196 <param name="qsid">{2}</param> 163 <!-- <param name="data">{1}</param>164 <param name="actionkey"></param>165 -->166 167 197 <result type="stream"> 168 198 <param name="contentType">text/xml</param> … … 195 225 </action> 196 226 197 <action name="pazpar2/" class="eu.clarin.cmdi.mdservice.action.Pz2Action" method="execute">198 <result name="success" type="stream">199 <param name="contentType">${getActionContentType()}</param>200 <param name="inputName">resultStream</param>201 </result>202 </action>203 204 <action name="sru/*" class="eu.clarin.cmdi.mdservice.action.SRUAction" method="execute">205 <param name="q">{1}</param>206 <result name="success" type="stream">207 <param name="contentType">text/xml</param>208 <param name="inputName">resultStream</param>209 </result>210 <result name="error" type="stream">211 <param name="contentType">text/xml</param>212 <param name="inputName">${getDiagnosticStreamName()}</param>213 </result>214 </action>215 216 <action name="model/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute">217 <param name="q">{1}</param>218 <param name="actionkey">model</param>219 <result type="stream">220 <param name="contentType">${getActionContentType()}</param>221 <param name="inputName">resultStream</param>222 </result>223 </action>224 225 <action name="search/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute">226 <param name="q">{*}</param>227 <param name="actionkey">search</param>228 <result type="stream">229 <param name="contentType">${getActionContentType()}</param>230 <param name="inputName">resultStream</param>231 </result>232 </action>233 234 <action name="record/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute">235 <param name="q">{1}</param>236 <param name="actionkey">record</param>237 <result type="stream">238 <param name="contentType">${getActionContentType()}</param>239 <param name="inputName">resultStream</param>240 </result>241 </action>242 243 <action name="collections/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute">244 <param name="format">{1}</param>245 <param name="actionkey">collections</param>246 <result type="stream">247 <param name="contentType">${getActionContentType()}</param>248 <param name="inputName">resultStream</param>249 </result>250 </action>251 252 253 227 </package> 254 255 228 </struts>
Note: See TracChangeset
for help on using the changeset viewer.