Changeset 555
- Timestamp:
- 06/28/10 20:39:21 (14 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r521 r555 69 69 </div> 70 70 71 <div id="detail"> 71 <div id="detail-float"> 72 <!-- 72 73 <ul> 73 74 <li><a href="#tabs-1">Tab 1</a></li> … … 76 77 <p>New tab</p> 77 78 </div> 79 --> 78 80 </div> 79 81 82 <div id="detail"> 83 <!-- <ul> 84 <li><a href="#tabs-1">Tab 1</a></li> 85 </ul> 86 <div id="tabs-1"> 87 <p>New tab</p> 88 </div> 89 --> 90 </div> 80 91 81 92 </div> -
MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js
r545 r555 151 151 }); 152 152 153 $(' .cmd_detail').live('click', function(event) {153 $('#terms .cmd_detail').live('click', function(event) { 154 154 //showTermDetail($(this).parent().text()); 155 155 … … 161 161 }); 162 162 163 $('#compreg .cmd_detail').live('click', function(event) { 164 //showTermDetail($(this).parent().text()); 165 166 var uri = $(this).parent().children('a').attr('href'); // + " body"; 167 $.ajax({ 168 url: uri, 169 success: showDetail2 170 }); 171 }); 172 163 173 // RECORDSET searchRetrieve 164 174 $('#searchretrieve').submit( function(event) { … … 195 205 //$("#detail").dialog(); 196 206 // $("#detail").tabs("add", "#components","Tab1"); 197 $("#detail").dialog(); 198 $("#detail").tabs(); 207 $("#detail-float").dialog(); 208 $("#detail-float").tabs(); 209 199 210 }); 200 211 … … 233 244 console.log("receiving data:"); 234 245 console.log(data); 246 $('#detail-float').html(data); 247 //$(this).html(data); 248 notifyUser("query processed:" + textStatus); 249 } catch (e) { 250 console.log(e); 251 } 252 } 253 254 function showDetail2(data, textStatus) { 255 try { 256 console.log("receiving data:"); 257 console.log(data); 235 258 $('#detail').html(data); 236 259 //$(this).html(data); 237 260 notifyUser("query processed:" + textStatus); 261 $("#detail .treeview").treeview({ 262 animated: "fast", 263 collapsed: true 264 }); 265 238 266 } catch (e) { 239 267 console.log(e); -
MDService2/trunk/MDService2/src/mdservice.properties
r526 r555 7 7 //scripts.path = C:/Users/master/3lingua/clarin/CMDI/scripts/ 8 8 scripts.path = xsl/ 9 //cache.path = C:/apps/ApacheTomcat/webapps/MDService2_cache/10 cache.path = C:/apache-tomcat-6.0.26/webapps/MDService2_cache/9 cache.path = C:/apps/ApacheTomcat/webapps/MDService2_cache/ 10 //cache.path = C:/apache-tomcat-6.0.26/webapps/MDService2_cache/ 11 11 xml.comp = 12 12 xsl.XCQL2XPATH = XCQL2Xpath.xsl -
MDService2/trunk/MDService2/src/struts.xml
r544 r555 48 48 <param name="actionkey">components</param> 49 49 <result type="stream"> 50 <param name="contentType">text/ xml</param>50 <param name="contentType">text/html</param> 51 51 <param name="inputName">resultStream</param> 52 52 </result> … … 132 132 <param name="q">{3}</param> 133 133 <result type="stream"> 134 <param name="contentType">text/ xml</param>134 <param name="contentType">text/html</param> 135 135 <param name="inputName">resultStream</param> 136 136 </result> -
MDService2/trunk/MDService2/src/xsl/cmd_commons.xsl
r525 r555 73 73 <!-- <xsl:variable name="resolved_fn" select="if (matches(@filename, $prefix)) then replace(@filename, $prefix, $prefix_replace) else if (document-uri(/)) then @filename else concat( $root_uri, '/', @filename)" /> --> 74 74 <xsl:variable name="resolved_fn" select="concat($components_uri, @ComponentId)" /> 75 75 <xsl:variable name="compid" select="@ComponentId" /> 76 76 77 <!-- <xsl:variable name="resolved_fn" select="replace(@filename, 'http://www.clarin.eu/cmd/components', 'file:///C:/Users/master/3lingua/clarin/CMDI/_repo2/metadata/toolkit/components')" /> --> 77 78 … … 85 86 <xsl:copy> 86 87 <!-- <xsl:attribute name="filename" select="replace($resolved_fn,$prefix_replace,'')" /> --> 87 <xsl:attribute name="ComponentId" select="@ComponentId" /> 88 89 <xsl:attribute name="ComponentId" select="$compid" /> 88 90 <xsl:apply-templates select="$outer-attr" mode="include"/> 89 91 <xsl:apply-templates select="$inner-attr[not(node-name(.) = $outer-attr/node-name(.))]" mode="include"/> … … 134 136 </xsl:choose> 135 137 </xsl:function> 138 139 <xsl:function name="my:extractID" > 140 <xsl:param name="uri" /> 141 <xsl:value-of select="substring-after($uri,'clarin.eu:cr1:')" /> 142 </xsl:function> 143 136 144 <!-- 137 145 <xsl:function name="my:numberFormat"> -
MDService2/trunk/MDService2/src/xsl/comp2view.xsl
r466 r555 9 9 10 10 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" 11 xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org"> 11 xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org" 12 xmlns:my="myFunctions"> 12 13 <xsl:strip-space elements="*"/> 13 14 <xsl:include href="cmd_commons.xsl"/> … … 163 164 <xsl:template match="/CMD_ComponentSpec" mode="list"> 164 165 <xsl:apply-templates select="Header" mode="list"/> 165 srcfile:<xsl:value-of select="$src_file" /> 166 <!-- srcfile:<xsl:value-of select="$src_file" /> --> 167 166 168 <ul id="starttree" class="treeview"> 167 <xsl:apply-templates select="CMD_Component" mode="list"/> 169 <xsl:apply-templates select="CMD_Component" mode="list"> 170 </xsl:apply-templates> 168 171 </ul> 169 172 </xsl:template> … … 176 179 177 180 <xsl:template match="CMD_Component" mode="list"> 178 <li><a href="{concat($detail_uri_prefix, @ComponentId)}" ><xsl:value-of select="@name" /></a> 181 <xsl:variable name="compid" select="if(@ComponentId) then @ComponentId else parent::CMD_ComponentSpec/ID" /> 182 <li><a href="{concat($detail_uri_prefix, my:extractID($compid))}" ><xsl:value-of select="@name" /></a> 179 183 <span class="cmd cmd_filter"><xsl:text> </xsl:text></span><span class="cmd cmd_detail" ><xsl:text> </xsl:text></span> 180 184 <!-- -
MDService2/trunk/MDService2/src/xsl/complist2view.xsl
r466 r555 98 98 </xsl:template> 99 99 100 101 <xsl:function name="my:extractID" >102 <xsl:param name="uri" />103 <xsl:value-of select="substring-after($uri,'clarin.eu:cr1:')" />104 </xsl:function>105 100 </xsl:stylesheet> -
MDService2/trunk/MDService2/src/xsl/model2view.xsl
r466 r555 38 38 39 39 <xsl:template name="continue-root"> 40 41 <xsl:choose>40 <div> 41 <xsl:choose> 42 42 <xsl:when test="$format='model2htmltable'" > 43 43 <xsl:call-template name="header"/> … … 51 51 </xsl:otherwise> 52 52 </xsl:choose> 53 53 </div> 54 54 55 55 </xsl:template>
Note: See TracChangeset
for help on using the changeset viewer.