Changeset 1033
- Timestamp:
- 01/04/11 10:23:16 (13 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r1032 r1033 116 116 <div id="query-input" class="content"> 117 117 <s:form action="searchretrieve"> 118 <!-- <label id="toggle_inputmode_cmd" value="TEXT" />--> 118 <!-- <label id="toggle_inputmode_cmd" value="TEXT" />--> 119 119 <input type="text" id="input-simplequery" name="_query" /> 120 <input type="submit" value="submit" id="submit-query"/> 121 <input type="checkbox" checked="false" id="input-withsumary" name="WS"/> 120 <input type="submit" value="submit" id="submit-query"/> 122 121 <input type="text" id="query_list" name="_query_" /> 123 122 <table class="cmds-ui-elem-stretch"><tr> … … 138 137 <!-- <textarea id="columns_list" class="cmds-ui-elem-stretch"></textarea> 139 138 --> 140 </td> 139 </td> 140 <td><input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label></td> 141 141 </tr></table> 142 142 </s:form> -
MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js
r1032 r1033 115 115 q.repository = getSelectedRepository(); 116 116 if (ws) { 117 q.options = "withSum ary";117 q.options = "withSummary"; 118 118 } 119 119 notifyUser("submit_query:" + q.query_uri(),'debug'); … … 1131 1131 notifyUser(searchclauseset.sctext,'debug'); 1132 1132 //submit_query ($('#columns_list').attr("value"),searchclauseset.sctext, $('#input-simplequery').attr("value")); 1133 submit_query (columns_widget.getColumnsListText(),searchclauseset.sctext, $('#input-simplequery').attr("value"), $('#input-withsum ary').attr("checked"));1133 submit_query (columns_widget.getColumnsListText(),searchclauseset.sctext, $('#input-simplequery').attr("value"), $('#input-withsummary').attr("checked")); 1134 1134 }); 1135 1135 … … 1459 1459 columns_widget.load(query.columns.split(',')); 1460 1460 $('#input-simplequery').attr("value",query.squery); 1461 $('#input-withsum ary').attr("checked",(query.options != null));1461 $('#input-withsummary').attr("checked",(query.options != null)); 1462 1462 } 1463 1463 -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r1032 r1033 100 100 params = params + "collection=" + this.getcollectiontext("index") + "&columns=" + this.getcolumnstext() + "&startRecord=" + this.startRecord + "&maximumRecords=" + this.maximumRecords + "&repository=" + this.repository; 101 101 if (this.options != null) { 102 params = params + "&options=withSum ary";102 params = params + "&options=withSummary"; 103 103 } 104 104 return params; -
MDService2/trunk/MDService2/WebContent/style/cmds-ui.css
r1029 r1033 140 140 .cmd_filter { background-image: url("imgs/cdb-icon-filter.png"); } 141 141 .cmd_get { background-image: url("imgs/icon_get.gif");} 142 .cmd-info { background-image: url("imgs/cdb-icon-info.png");} 142 143 .cmd_load { background-image: url("imgs/cdb-icon-load.png");} 143 144 .cmd_reload { background-image: url("imgs/cdb-icon-load.png");} -
MDService2/trunk/MDService2/docs/MDService2.wadl
r885 r1033 28 28 <param name="repository" type="xs:int" style="matrix" default="1"> 29 29 <doc>allows to dynamically select one of the available repositories for the queries.<br/> 30 Probably this should be rather a semantic identifier 30 Probably this should be rather a semantic identifier (a string-key instead of int) 31 31 </doc> 32 32 </param> … … 238 238 </resource> 239 239 240 </resources> 241 242 <resources base="http://cmdi.clarin.eu/mdservice/admin/"> 243 244 <resource id="cache" path="cache/{format}"> 245 <doc title="Cache" > 246 Allows to view the cache-index 247 </doc> 248 <method name="GET"> 249 <request> 250 <param name="format" type="xs:string" style="template" default="public" > 251 <option value="xml" /> 252 <option value="htmlpage" /> 253 </param> 254 </request> 255 <response> 256 <representation mediaType="text/html"> 257 </representation> 258 </response> 259 </method> 260 <resource id="cache-del" path="del"> 261 <doc title="Cache" > 262 Allows to delete/flush (parts of) cache; parameters constraint the part of cache to be deleted; 263 no param means: delete everything 264 </doc> 265 <method name="GET"> 266 <request> 267 <param name="actionkey" type="xs:string" style="query" default="public" optional="yes"></param> 268 <param name="repository" type="xs:int" style="query" default="public" optional="yes"></param> 269 <param name="date" type="xs:date" style="query" default="public" optional="yes"></param> 270 </request> 271 <response> 272 <representation mediaType="text/html"></representation> 273 </response> 274 </method> 275 </resource> 276 </resource> 277 278 240 279 </resources> 241 280 -
MDService2/trunk/MDService2/src/xsl/cmd_functions.xsl
r1029 r1033 154 154 <xsl:param name="url" /> 155 155 <!-- <xsl:value-of select="replace($url, 'http://www.isocat.org/datcat/','isocat:')" /> --> 156 <xsl:variable name="matching_termset" select=" $terms_setup/Termsets/Termset[starts-with($url,@url_prefix)]" />156 <xsl:variable name="matching_termset" select="if($url!='') then $terms_setup/Termsets/Termset[@url_prefix][starts-with($url,@url_prefix)] else ()" /> 157 157 <xsl:message>shortURL: <xsl:copy-of select="$matching_termset" />:: <xsl:value-of select="$matching_termset[1]/@url_prefix" /> 158 <xsl: copy-of select="$url" />158 <xsl:value-of select="$url" /> 159 159 </xsl:message> 160 160 <xsl:value-of select="if ($matching_termset/@url_prefix and $matching_termset/@url_prefix!='' and $url!='') then replace($url, $matching_termset[1]/@url_prefix, concat(string-join($matching_termset/@id,','),':')) else $url" /> -
MDService2/trunk/MDService2/src/xsl/model2view.xsl
r765 r1033 206 206 </xsl:when> 207 207 <xsl:otherwise> 208 <!-- testwise: show only non empty Terms--> 209 <xsl:apply-templates select="Term[@count_distinct_text > 1]" mode="detail"> 208 <!-- testwise: show only non empty Terms, no good, because only leaf-elements have filled @count_distinct_text 209 <xsl:apply-templates select="Term[@count_distinct_text > 1]" mode="detail"> --> 210 <xsl:apply-templates select="Term" mode="detail"> 210 211 <xsl:with-param name="parentid" select="$xid" /> 211 212 </xsl:apply-templates> -
MDService2/trunk/MDService2/src/xsl/terms2view.xsl
r1029 r1033 15 15 <xsl:import href="cmd_commons.xsl"/> 16 16 17 < xsl:output method="xml" />17 <!-- <xsl:output method="xml" /> --> 18 18 19 19 <!-- <xsl:param name="size_lowerbound">0</xsl:param> … … 197 197 <xsl:otherwise> 198 198 <!-- testwise: show only non empty Terms--> 199 <xsl:apply-templates select="Term [@count_distinct_text > 1]" mode="detail">199 <xsl:apply-templates select="Term" mode="detail"> 200 200 <xsl:with-param name="parentid" select="$xid" /> 201 201 </xsl:apply-templates> … … 349 349 <script type="text/javascript" > 350 350 $(function(){ 351 $(" #modeltree").treeTable({initialState:"expanded"});351 $(".terms-tree").treeTable({initialState:"expanded"}); 352 352 }); 353 353 </script>
Note: See TracChangeset
for help on using the changeset viewer.