Changeset 1531 for MDService2


Ignore:
Timestamp:
09/13/11 09:56:52 (13 years ago)
Author:
vronk
Message:

small changes to stylesheets and static-xml

Location:
MDService2/branches/MDService_simple3
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • MDService2/branches/MDService_simple3/WebContent/static/index.xml

    r1504 r1531  
    66                <a class="request" href="static/welcome?format=htmldetail" >Welcome</a>
    77
    8                 <a class="request" href="/collections/htmllist?repository=clarin.at-mirror&amp;collection=&amp;maxdepth=1">collections clarin.at</a>
    9                 <a class="request" href="/collections/htmllist?repository=gu.se-main&amp;collection=&amp;maxdepth=1">collections gu.se-main</a>
     8                <a class="request" href="collection/htmllist?repository=clarin.at-mirror&amp;collection=&amp;maxdepth=1">collections clarin.at</a>
     9                <a class="request" href="collection/htmllist?repository=gu.se-main&amp;collection=&amp;maxdepth=1">collections gu.se-main</a>
    1010               
    1111        </div> 

  • MDService2/branches/MDService_simple3/WebContent/static/test2.xml

    r1522 r1531  
    1616                        </tr>
    1717                </table>
     18                <a class="request" href="record/htmldetail?q=clarin%252Eeu%3Alrt%3A977" >one sample record</a>         
    1819                <!-- <a class="query" href="/MDService2/recordset/htmltable/?squery=syntax&amp;maximumItems=10">system</a>  -->
    1920                 <!--

  • MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java

    r1530 r1531  
    187187       
    188188        /**
    189          * TODO: check what this does, where it is used?
     189         * needed to acquire the original ServletRequest
     190         * (want to access the raw params - in loadParams())
    190191         * @return
    191192         */
    … …  
    226227        /**
    227228         * Reads in all the parameters of the request into an internal structure.
    228          * the Map is not Map<String,String>, but rather Map<String,String[]>,
    229          * ie the value is an array of Strings!
    230          * http://download.oracle.com/docs/cd/E17802_01/webservices/webservices/docs/1.5/api/javax/servlet/ServletRequest.html#getParameterMap%28%29
     229         * the Map is not Map&lt;String,String&gt;, but rather Map&lt;String,String[]&gt;,
     230         * ie the value is an array of Strings! <a href="http://download.oracle.com/docs/cd/E17802_01/webservices/webservices/docs/1.5/api/javax/servlet/ServletRequest.html#getParameterMap%28%29" >javadocs:ServletRequest.getParameterMap()</a>
    231231         *
    232232         * This shall allow more flexibility in using the parameters in the subclasses (and less getter/setter stuff)

  • MDService2/branches/MDService_simple3/src/struts.xml

    r1530 r1531  
    3636        <!-- If no name value for the result node is specified the success value is the default -->
    3737                <!-- <action name="index"><result>/index.jsp</result></action> -->
    38 <!-- BASIC ACTIONS -->           
     38<!-- BASIC ACTIONS -->
     39                <action name="" class="eu.clarin.cmdi.mdservice.action.StaticAction" method="execute">
     40                           <param name="actionkey">static</param>
     41                           <param name="format">htmlpage</param>
     42                           <param name="q">index</param>                           
     43                            <result type="stream">                         
     44                                <param name="contentType">${getActionContentType()}</param>
     45                                <param name="inputName">resultStream</param>                           
     46                            </result>
     47                </action>               
    3948                <action name="index" class="eu.clarin.cmdi.mdservice.action.StaticAction" method="execute">
    4049                           <param name="actionkey">static</param>

  • MDService2/branches/MDService_simple3/src/xsl/cmd_functions.xsl

    r1508 r1531  
    189189                        </xsl:when>
    190190                        <xsl:when test="$q=''">
    191                                 <xsl:value-of select="concat($base_dir, '/',$action, '/?format=', $format)" />
     191<!--                            <xsl:value-of select="concat($base_dir, '/',$action, '/?format=', $format)" />-->
     192                                        <xsl:value-of select="concat($base_dir, '/',$action, '/', $format)" />
    192193                        </xsl:when>                     
    193194                        <xsl:otherwise>
    194                                 <xsl:value-of select="concat($base_dir, '/',$action, '/?format=', $format, '&amp;', $q, '&amp;repository=', $repository_name)" />
     195<!--                            <xsl:value-of select="concat($base_dir, '/',$action, '/?format=', $format, '&amp;', $q, '&amp;repository=', $repository_name)" />-->
     196                                <xsl:value-of select="concat($base_dir, '/',$action, '/', $format, '?q=', $q, '&amp;repository=', $repository_name)" />
    195197                        </xsl:otherwise>
    196198                </xsl:choose>

  • MDService2/branches/MDService_simple3/src/xsl/html_snippets.xsl

    r1527 r1531  
    7474                <div class="content" id="query-input" >         
    7575                        <form action="{my:formURL('search', 'htmlpage','')}" method="get">                                                     
    76                                 <input type="text" id="input-simplequery" name="squery"/>
     76                                <input type="text" id="input-simplequery" name="squery" value="{$q}" />
    7777                                <input type="submit"  value="submit" id="submit-query"/>
    7878                               

  • MDService2/branches/MDService_simple3/src/xsl/mdset2view.xsl

    r1503 r1531  
    8787<xsl:for-each select="searchRetrieveResponse" >
    8888<div>
     89        <xsl:call-template name="query-input" />
    8990        <xsl:if test="not(contains($format, 'htmlsimple'))">
    9091                <xsl:call-template name="header" />
Note: See TracChangeset for help on using the changeset viewer.