Changeset 1575 for MDService2
- Timestamp:
- 10/07/11 13:12:15 (13 years ago)
- Location:
- MDService2/branches/MDService_simple3
- Files:
-
- 5 edited
-
WebContent/static/queries.xml (modified) (5 diffs)
-
WebContent/static/queries2.xml (modified) (3 diffs)
-
src/xsl/cmd_functions.xsl (modified) (1 diff)
-
src/xsl/mdset2view.xsl (modified) (1 diff)
-
src/xsl/static2view.xsl (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
MDService2/branches/MDService_simple3/WebContent/static/queries.xml
r1266 r1575 6 6 <dd><p>just one word like:</p> 7 7 <ul> 8 <li><a class="query" href="/MDService2/? squery=system">system</a></li>9 <li><a class="query" href="/MDService2/? squery=-year-olds">-year-olds</a> - a bug there (don't use '-'!)</li>10 <li><a class="query" href="/MDService2/? squery=acquisition">acquisition</a></li>8 <li><a class="query" href="/MDService2/?query=system">system</a></li> 9 <li><a class="query" href="/MDService2/?query=-year-olds">-year-olds</a> - a bug there (don't use '-'!)</li> 10 <li><a class="query" href="/MDService2/?query=acquisition">acquisition</a></li> 11 11 </ul> 12 12 </dd> … … 14 14 <dd> 15 15 <ul> 16 <li><a class="query" href="/MDService2/?squery=/?squery=child%20%7C%20acquisition">child | acquisition</a></li> 16 <!-- <li><a class="query" href="/MDService2/?squery=/?squery=child%20%7C%20acquisition">child | acquisition</a></li> 17 --> 17 18 </ul> 18 19 </dd> … … 20 21 <dd> 21 22 <ul> 22 <li><a class="query" href="/MDService2/? squery=child%20acquisition">child acquisition</a></li>23 <li><a class="query" href="/MDService2/? squery=longitudinal%20study">longitudinal study</a></li>23 <li><a class="query" href="/MDService2/?query=child%20acquisition">child acquisition</a></li> 24 <li><a class="query" href="/MDService2/?query=longitudinal%20study">longitudinal study</a></li> 24 25 </ul> 25 26 </dd> … … 27 28 <dd>a sequence of terms 28 29 <ul> 29 <li><a class="query" href="/MDService2/? squery=%22longitudinal%20study%22">"longitudinal study"</a></li>30 <li><a class="query" href="/MDService2/?query=%22longitudinal%20study%22">"longitudinal study"</a></li> 30 31 </ul> 31 32 </dd> 33 <!-- 34 32 35 <dt >Bookmarks</dt> 33 36 <dd>search/remember individual records (by handle/identifier) … … 86 89 </ul> 87 90 </dd> 88 </dl> 91 92 --> 93 </dl> 89 94 </div> 90 95 </info> -
MDService2/branches/MDService_simple3/WebContent/static/queries2.xml
r1495 r1575 6 6 <dd><p>just one word like:</p> 7 7 <ul> 8 <li><a class="query count" href="? squery=system">system</a></li>9 <li><a class="query count" href="? squery=-year-olds">-year-olds</a> - a bug solved (parser doesn't like '-' at the beginning!)</li>10 <li><a class="query count" href="? squery=acquisition">acquisition</a></li>8 <li><a class="query count" href="?query=system">system</a></li> 9 <li><a class="query count" href="?query=-year-olds">-year-olds</a> - a bug solved (parser doesn't like '-' at the beginning!)</li> 10 <li><a class="query count" href="?query=acquisition">acquisition</a></li> 11 11 </ul> 12 12 </dd> 13 14 15 13 <dt >all of multiple terms (AND)</dt> 16 14 <dd> 17 15 <ul> 18 <li><a class="query count" href="? squery=child%20acquisition">child acquisition</a></li>19 <li><a class="query count" href="? squery=longitudinal%20study">longitudinal study</a></li>16 <li><a class="query count" href="?query=child%20acquisition">child acquisition</a></li> 17 <li><a class="query count" href="?query=longitudinal%20study">longitudinal study</a></li> 20 18 </ul> 21 19 </dd> … … 23 21 <dd>a sequence of terms 24 22 <ul> 25 <li><a class="query count" href="? squery=%22longitudinal%20study%22">"longitudinal study"</a></li>23 <li><a class="query count" href="?query=%22longitudinal%20study%22">"longitudinal study"</a></li> 26 24 </ul> 27 25 </dd> … … 34 32 </dd> 35 33 36 <!-- 34 <!-- 37 35 <dt >Bookmarks</dt> 38 36 <dd>search/remember individual records (by handle/identifier) -
MDService2/branches/MDService_simple3/src/xsl/cmd_functions.xsl
r1574 r1575 231 231 <xsl:param name="maximumRecords" /> 232 232 233 <xsl:variable name="searchurl" select="my:formURL('search','htmlpage','')" /> 233 <xsl:variable name="searchurl" select="concat($base_dir, '/search/', $format, '?')" /> 234 <xsl:variable name="param_query"> 235 <xsl:if test="$q != ''"> 236 <xsl:value-of select="concat('query=',$q)"></xsl:value-of> 237 </xsl:if> 238 </xsl:variable> 234 239 <xsl:variable name="param_repository"> 235 240 <xsl:if test="$repository_name != ''"> 236 241 <xsl:value-of select="concat('&repository=',$repository_name)"></xsl:value-of> 237 </xsl:if>238 </xsl:variable>239 <xsl:variable name="param_query">240 <xsl:if test="$q != ''">241 <xsl:value-of select="concat('&query=',$q)"></xsl:value-of>242 242 </xsl:if> 243 243 </xsl:variable> -
MDService2/branches/MDService_simple3/src/xsl/mdset2view.xsl
r1574 r1575 424 424 <a class="internal" href="{concat('../../record/htmldetail/', my:encodePID(.//MdSelfLink), '?repository=', $repository_name)}" > 425 425 <xsl:value-of select="$absolute_position" /> 426 </a> 426 </a> 427 <a class="internal" href="{my:formURL('record', 'htmldetail', my:encodePID(.//MdSelfLink))}"><span class="cmd cmd_detail" ></span></a> 428 </xsl:when> 429 <xsl:when test="contains($format, 'htmltable')" > 430 <a class="internal" href="{my:formURL('record', 'htmldetail', my:encodePID(.//MdSelfLink))}" > 431 <xsl:value-of select="$absolute_position" /> 432 </a> 433 <a class="internal" href="{my:formURL('record', 'htmldetail', my:encodePID(.//MdSelfLink))}"><span class="cmd cmd_detail" ></span></a> 427 434 </xsl:when> 428 435 <xsl:otherwise> 429 <a class="internal" href="{my:formURL('record', 'html detail', my:encodePID(.//MdSelfLink))}" >436 <a class="internal" href="{my:formURL('record', 'htmlpage', my:encodePID(.//MdSelfLink))}" > 430 437 <xsl:value-of select="$absolute_position" /> 431 438 </a> 439 <a class="internal" href="{my:formURL('record', 'htmlpage', my:encodePID(.//MdSelfLink))}"><span class="cmd cmd_detail" ></span></a> 432 440 </xsl:otherwise> 433 441 </xsl:choose> 434 <a class="internal" href="{my:formURL('record', 'htmldetail', my:encodePID(.//MdSelfLink))}"><span class="cmd cmd_detail" ></span></a>435 442 436 443 <span class="cmd cmd_save" ></span> -
MDService2/branches/MDService_simple3/src/xsl/static2view.xsl
r1558 r1575 53 53 <xsl:template match="a[contains(@class,'query') or contains(@class,'request')]"> 54 54 55 <xsl:variable name="specific_prefix" select="if (contains(@href,'query')) then 'search/htmlpage /' else ''" />55 <xsl:variable name="specific_prefix" select="if (contains(@href,'query')) then 'search/htmlpage' else ''" /> 56 56 57 57 <xsl:variable name="target_url" > … … 61 61 </xsl:when> 62 62 <xsl:when test="@class='query count'"> 63 <xsl:copy-of select="concat($base_url, 'search/xml /', @href)" />63 <xsl:copy-of select="concat($base_url, 'search/xml', @href)" /> 64 64 </xsl:when> 65 65 <xsl:when test="@class='request'"> … … 68 68 69 69 <xsl:when test="@class='query'"> 70 <xsl:copy-of select="concat($base_url, 'search/htmltable /', @href)" />70 <xsl:copy-of select="concat($base_url, 'search/htmltable', @href)" /> 71 71 </xsl:when> 72 72 <xsl:when test="starts-with(@href,'http:')"> … … 122 122 </xsl:when> 123 123 <xsl:when test="@class='query count'"> 124 <xsl:value-of select="$data//numberOfRecords" />125 124 number of records: <xsl:value-of select="$data//numberOfRecords" /> 125 </xsl:when> 126 126 127 127 <!-- <xsl:when test="@class='query'">
Note: See TracChangeset
for help on using the changeset viewer.
