Changeset 1392 for MDService2/trunk
- Timestamp:
- 06/07/11 11:38:15 (13 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r1388 r1392 226 226 query.id = $(data).text(); 227 227 if (query.bookmark == 0){ 228 this.addelement("query", json, query); 228 229 appendQueryUI(json,qsid, $('#userqueries')); 229 230 } else { 231 this.addelement("bookmark", json, query); 230 232 appendBookmarkUI(json,qsid, $('#bookmarks')); 231 233 } … … 365 367 Query.prototype.save = function(){ 366 368 var qsid; 367 var qsjson;368 369 var jsonq = this.toJSON(); 369 370 371 if (this.bookmark == 0){ 372 qsid = parseInt($("#qts_select option:selected").val()); 373 } else { 374 qsid = parseInt($("#bts_select option:selected").val()); 375 } 376 workspace.savequery(jsonq, qsid, this); 377 378 /* 370 379 if (this.bookmark == 0){ 371 380 qsid = parseInt($("#qts_select option:selected").val()); … … 388 397 } 389 398 390 399 */ 391 400 392 401 }; -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java
r1215 r1392 533 533 if (getColumns() != null){ 534 534 hm.put("cols", getColumns()); 535 } else { 536 hm.put("cols", ""); 535 537 } 536 538 if (getStartItem() != null){ -
MDService2/trunk/MDService2/src/mdservice.properties
r1389 r1392 30 30 xsl.recordset2htmlpage = mdset2view.xsl 31 31 xsl.recordset2htmllist = mdset2view.xsl 32 xsl.recordset2htmlsimple = mdset2view.xsl 32 33 xsl.record2htmldetail = mdinst2view.xsl 33 34 xsl.record2htmlpage = mdinst2view.xsl -
MDService2/trunk/MDService2/src/xsl/cmd_commons.xsl
r1270 r1392 43 43 <xsl:call-template name="html"/> 44 44 </xsl:when> 45 <xsl:when test="contains($format,'htmlsimple')" > 46 <xsl:call-template name="htmlsimple"/> 47 </xsl:when> 45 48 <xsl:otherwise> 46 49 <xsl:call-template name="continue-root"/> … … 80 83 <body> 81 84 <h1><xsl:value-of select="$title"/></h1> 85 <xsl:call-template name="continue-root"/> 86 </body> 87 </html> 88 </xsl:template> 89 90 <xsl:template name="htmlsimple"> 91 92 <html> 93 <head> 94 <title><xsl:value-of select="$title"/></title> 95 <!-- <xsl:call-template name="callback-header"/> --> 96 </head> 97 <body> 98 <!-- <h1><xsl:value-of select="$title"/></h1> --> 82 99 <xsl:call-template name="continue-root"/> 83 100 </body> -
MDService2/trunk/MDService2/src/xsl/mdset2view.xsl
r1388 r1392 77 77 78 78 <xsl:for-each select="searchRetrieveResponse" > 79 <xsl:call-template name="header" /> 79 <xsl:if test="not(contains($format, 'htmlsimple'))"> 80 <xsl:call-template name="header" /> 81 </xsl:if> 80 82 <xsl:choose> 81 83 <xsl:when test="contains($format,'htmltable')"> … … 93 95 <xsl:when test="contains($format, 'htmlpagelist')"> 94 96 <xsl:apply-templates select="records" mode="list" /> 95 </xsl:when> 97 </xsl:when> 98 <xsl:when test="contains($format, 'htmlsimple')"> 99 <xsl:apply-templates select="records" mode="simple" /> 100 </xsl:when> 96 101 <xsl:otherwise>mdset2view: unrecognized format: <xsl:value-of select="$format" /></xsl:otherwise> 97 102 </xsl:choose> … … 350 355 351 356 357 <xsl:template match="records" mode="simple"> 358 359 <form action="" method="get"> 360 <input type="text" name="squery" > </input> 361 <input type="submit" value="Submit" > </input> 362 </form> 363 <table class="show"> 364 <thead><tr><th>pos</th> 365 <xsl:for-each select="$columns/*"> 366 <th title="{@key}" ><xsl:value-of select="@label"/></th> 367 </xsl:for-each> 368 </tr></thead> 369 <tbody> 370 <xsl:apply-templates select="CMD" mode="table" /> 371 </tbody> 372 </table> 373 374 </xsl:template> 375 352 376 </xsl:stylesheet>
Note: See TracChangeset
for help on using the changeset viewer.