Changeset 1155
- Timestamp:
- 03/05/11 18:23:01 (13 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 6 edited
-
WebContent/index.jsp (modified) (2 diffs)
-
WebContent/style/cmds-ui.css (modified) (2 diffs)
-
src/eu/clarin/cmdi/mdservice/action/Cache.java (modified) (1 diff)
-
src/xsl/cmd_functions.xsl (modified) (1 diff)
-
src/xsl/comp2view.xsl (modified) (1 diff)
-
src/xsl/mdset2view.xsl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r1153 r1155 70 70 <input type="submit" value="submit" id="submit-query"/> 71 71 72 <div> 72 73 <table class="cmds-ui-elem-stretch ui-advanced"> 73 <tr><td> 74 <div id="searchclauselist"></div> 75 74 <tr> 75 <td valign="top"> 76 76 <div id="repositories" > 77 <label>Repository</label> <select id="repositories_select" ></select> 78 <input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label> 77 <label>Repository</label> <select id="repositories_select" ></select> 79 78 </div> 79 <!-- selected collections --> 80 <label>Collections</label><br/> 81 <div id="collections-widget" class="c-widget"></div> 82 <!-- all COLLECTIONS BLOCK --> 83 <div class="cmds-ui-block" id="collections-block"> 84 <!-- <div class="header">Collections</div> --> 85 <div id="collections" class="content"></div> 86 </div> 87 <!-- ------------------------------------- --> 80 88 </td> 81 </tr> 82 <tr> 83 <td valign="top"> 84 <label>columns</label><br/> 85 <div id="columns-widget" class="c-widget"></div> 86 </td> 87 <td valign="top"> 88 <label>collections</label><br/> 89 <div id="collections-widget" class="c-widget"></div> 90 </td> 91 </tr> 92 <tr> 93 <td valign="top"> 89 <td valign="top"> 90 <label>Complex query</label><br/> 91 <div id="searchclauselist"></div> 92 <input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label> 93 </td> 94 </tr> 94 95 <!-- TERMS BLOCK --> 95 <div class="cmds-ui-block" id="terms-block">96 <!-- <div class="cmds-ui-block" id="terms-block"> 96 97 <div class="header">Terms</div> 97 98 <div id="terms" class="content"> … … 100 101 </div> 101 102 <div id="terms_autocomplete"></div> 102 </div> 103 <!-- ------------------------------------- --> 104 </td> 105 <td valign="top"> 106 <!-- COLLECTIONS BLOCK --> 107 <div class="cmds-ui-block" id="collections-block"> 108 <div class="header">Collections</div> 109 <div id="collections" class="content"></div> 110 </div> 111 <!-- ------------------------------------- --> 112 </td> 113 </tr> 103 </div> 104 105 <label>columns</label><br/> 106 <div id="columns-widget" class="c-widget"></div> 107 --> 108 114 109 </table> 115 110 </div> 116 111 </s:form> 117 112 </div> -
MDService2/trunk/MDService2/WebContent/style/cmds-ui.css
r1136 r1155 106 106 #input-simplequery { width: 85%; margin: 12px 0px 6px 0px; font-size: 1.2em;} 107 107 #submit-query {} 108 #searchclauselist {margin: 12px0px;}108 #searchclauselist {margin: 0px;} 109 109 .searchclause { } 110 110 .and_level {border-top: 1px solid #9999cc; margin: 2px 0px;} … … 112 112 113 113 .sc-wrapper { margin: 1px 0px; } 114 .index-input { width: 40%; }114 .index-input { width:38%; } 115 115 .rel_input { width:8%; } 116 .value_input { width:3 2%; }116 .value_input { width:30%; } 117 117 .sc_cmds { } 118 .sc_id {display:none;} 118 119 119 120 .result-header { float: right; } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Cache.java
r1076 r1155 321 321 } catch (XPathExpressionException e) { 322 322 // TODO Auto-generated catch block 323 e.printStackTrace();323 Admin.notifyUser("ERROR Cache.formPath: "+xpath_expr); 324 324 } 325 325 -
MDService2/trunk/MDService2/src/xsl/cmd_functions.xsl
r1081 r1155 157 157 <!-- <xsl:variable name="matchinge_termset" select="if($url!='') then if ($terms_setup/Termsets/Termset[@url_prefix][starts-with($url,@url_prefix)]) then $terms_setup/Termsets/Termset[@url_prefix][starts-with($url,@url_prefix)][1] 158 158 else if $terms_setup/Termsets/Termset[@url][starts-with($url,@url)] then $terms_setup/Termsets/Termset[@url][starts-with($url,@url)][1] else ()" /> --> 159 < !--<xsl:message>shortURL: <xsl:value-of select="$matching_termset/@url_prefix" />:: <xsl:value-of select="$url" />160 </xsl:message> -->159 <xsl:message>shortURL: <xsl:value-of select="$matching_termset/@url_prefix" />:: <xsl:value-of select="$url" /> 160 </xsl:message> 161 161 <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" /> 162 162 </xsl:function> -
MDService2/trunk/MDService2/src/xsl/comp2view.xsl
r908 r1155 143 143 144 144 <xsl:template match="@ConceptLink"> 145 <span class="conceptlink">[<a href="{my:rewriteURL(.)}" ><xsl:value-of select="my:shortURL( text())" /></a>]</span>145 <span class="conceptlink">[<a href="{my:rewriteURL(.)}" ><xsl:value-of select="my:shortURL(.)" /></a>]</span> 146 146 </xsl:template> 147 147 -
MDService2/trunk/MDService2/src/xsl/mdset2view.xsl
r1153 r1155 89 89 </xsl:when> 90 90 <xsl:when test="contains($format, 'htmlpage')"> 91 <xsl:apply-templates select="records" mode="detail" /> 91 <xsl:apply-templates select="records" mode="table" /> 92 </xsl:when> 93 <xsl:when test="contains($format, 'htmlpagelist')"> 94 <xsl:apply-templates select="records" mode="list" /> 92 95 </xsl:when> 93 96 <xsl:otherwise>mdset2view: unrecognized format: <xsl:value-of select="$format" /></xsl:otherwise>
Note: See TracChangeset
for help on using the changeset viewer.
