Ignore:
Timestamp:
2020-08-06T16:36:48+12:00 (4 years ago)
Author:
ak19
Message:
  1. As Dr Bainbridge/Kathy suggested, passing in buildOption remove_empty_classifications to empty classifiers on meta fields that have no values in a collection. 2. Adjusting WMTB collection templates' format statements to work with Section level searching, which Dr Bainbridge suggested should be the default level: display-metadata format statement template now uses select=root since they're all doc-level meta. The search format statement displays 'section level title' of 'doc level title' for section level results. The subsequent call-template=display-metadata now works for doclevel or section level searches as display-metadata uses select=root for all meta. 3. Adjusting collection title for collection templates.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/model-sites-dev/opotiki/collect/song-template-coll/etc/collectionConfig.xml

    r34309 r34314  
    4242    </metadataList>
    4343    <displayItemList>
    44         <displayItem assigned="true" lang="en" name="name">song template collection</displayItem>
     44        <displayItem assigned="true" lang="en" name="name">song collection template</displayItem>
    4545        <displayItem assigned="true" lang="en" name="allfields">all</displayItem>
    4646        <displayItem assigned="true" lang="en" name="text">text</displayItem>
    4747        <displayItem assigned="true" lang="en" name="wmtb.Title">titles</displayItem>
    4848        <displayItem assigned="true" lang="en" name="wmtb.HapuOrIwi">hapÅ« or iwi</displayItem>
    49         <displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
    5049        <displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
    5150        <displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
    5251        <displayItem assigned="true" lang="en" name="wmtb.Composer">composers</displayItem>
    5352        <displayItem assigned="true" lang="en" name="wmtb.Genre">genre</displayItem>
    54         <displayItem assigned="true" lang="en" name="wmtb.Caption">captions</displayItem>
    55         <displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
    56         <displayItem assigned="true" lang="en" name="wmtb.BoardOrSubcollection">board or subcollection</displayItem>
    5753        <displayItem assigned="true" lang="en" name="wmtb.Year">date</displayItem>
    5854        <displayItem assigned="true" lang="en" name="wmtb.Location">location</displayItem>
    … …  
    6662        <displayItem assigned="true" lang="en" name="document">document</displayItem>
    6763        <displayItem assigned="true" lang="en" name="section">section</displayItem>
     64        <displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
     65        <displayItem assigned="true" lang="en" name="wmtb.Caption">captions</displayItem>
     66        <displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
     67        <displayItem assigned="true" lang="en" name="wmtb.BoardOrSubcollection">board or subcollection</displayItem>
    6868        <displayItem assigned="true" lang="en" name="dc.Title,ex.dc.Title,Title">titles</displayItem>
    6969        <displayItem assigned="true" lang="en" name="shortDescription">kohingak</displayItem>
    7070        <displayItem assigned="true" lang="en" name=".allfields">allfields</displayItem>
    71         <displayItem assigned="true" lang="en" name="description">Template for waiata only collections</displayItem>
    7271    </displayItemList>
    7372    <format>  <gsf:template name="choose-title">
    … …  
    8685-->
    8786    <gsf:switch>
    88       <gsf:metadata name="wmtb.HapuOrIwi"/>
    89       <gsf:when test="exists"><br/> HapÅ« or Iwi: <gsf:metadata name="wmtb.HapuOrIwi"/></gsf:when>
     87      <gsf:metadata name="wmtb.HapuOrIwi" select="root"/>
     88      <gsf:when test="exists"><br/> HapÅ« or Iwi: <gsf:metadata name="wmtb.HapuOrIwi" select="root"/></gsf:when>
    9089    </gsf:switch>
    9190<!--
    … …  
    9392-->
    9493    <gsf:switch>
    95       <gsf:metadata name="wmtb.Singer"/>
    96       <gsf:when test="exists"><br/> Singer(s): <gsf:metadata name="wmtb.Singer"/></gsf:when>
    97     </gsf:switch>
    98     <gsf:switch>
    99       <gsf:metadata name="wmtb.Lyricist"/>
    100       <gsf:when test="exists"><br/> Lyricist(s): <gsf:metadata name="wmtb.Lyricist"/></gsf:when>
    101     </gsf:switch>
    102     <gsf:switch>
    103       <gsf:metadata name="wmtb.Composer"/>
    104       <gsf:when test="exists"><br/> Composer(s): <gsf:metadata name="wmtb.Composer"/></gsf:when>
    105     </gsf:switch>
    106     <gsf:switch>
    107       <gsf:metadata name="wmtb.Genre"/>
    108       <gsf:when test="exists"><br/> Genre(s): <gsf:metadata name="wmtb.Genre"/></gsf:when>
    109     </gsf:switch>
    110     <gsf:switch>
    111       <gsf:metadata name="wmtb.MediaType"/>
    112       <gsf:when test="exists"><br/> MediaType(s): <gsf:metadata name="wmtb.MediaType"/></gsf:when>
     94      <gsf:metadata name="wmtb.Singer" select="root"/>
     95      <gsf:when test="exists"><br/> Singer(s): <gsf:metadata name="wmtb.Singer" select="root"/></gsf:when>
     96    </gsf:switch>
     97    <gsf:switch>
     98      <gsf:metadata name="wmtb.Lyricist" select="root"/>
     99      <gsf:when test="exists"><br/> Lyricist(s): <gsf:metadata name="wmtb.Lyricist" select="root"/></gsf:when>
     100    </gsf:switch>
     101    <gsf:switch>
     102      <gsf:metadata name="wmtb.Composer" select="root"/>
     103      <gsf:when test="exists"><br/> Composer(s): <gsf:metadata name="wmtb.Composer" select="root"/></gsf:when>
     104    </gsf:switch>
     105    <gsf:switch>
     106      <gsf:metadata name="wmtb.Genre" select="root"/>
     107      <gsf:when test="exists"><br/> Genre(s): <gsf:metadata name="wmtb.Genre" select="root"/></gsf:when>
     108    </gsf:switch>
     109    <gsf:switch>
     110      <gsf:metadata name="wmtb.MediaType" select="root"/>
     111      <gsf:when test="exists"><br/> MediaType(s): <gsf:metadata name="wmtb.MediaType" select="root"/></gsf:when>
    113112    </gsf:switch>
    114113<!--
    … …  
    116115-->
    117116    <gsf:switch>
    118       <gsf:metadata name="wmtb.Location"/>
    119       <gsf:when test="exists"><br/> Location(s): <gsf:metadata name="wmtb.Location"/></gsf:when>
    120     </gsf:switch>
    121     <gsf:switch>
    122       <gsf:metadata name="wmtb.DateType"/>
    123       <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType"/>: </gsf:when>
     117      <gsf:metadata name="wmtb.Location" select="root"/>
     118      <gsf:when test="exists"><br/> Location(s): <gsf:metadata name="wmtb.Location" select="root"/></gsf:when>
     119    </gsf:switch>
     120    <gsf:switch>
     121      <gsf:metadata name="wmtb.DateType" select="root"/>
     122      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType" select="root"/>: </gsf:when>
    124123      <gsf:otherwise><br/>Date: </gsf:otherwise>
    125124    </gsf:switch>
    126125    <gsf:switch>
    127       <gsf:metadata name="wmtb.Day"/>
    128       <gsf:when test="exists"><gsf:metadata name="wmtb.Day"/>/</gsf:when>
    129     </gsf:switch>
    130     <gsf:switch>
    131       <gsf:metadata name="wmtb.Month"/>
    132       <gsf:when test="exists"><gsf:metadata name="wmtb.Month"/>/</gsf:when>
    133     </gsf:switch>
    134     <gsf:switch>
    135       <gsf:metadata name="wmtb.Year"/>
     126      <gsf:metadata name="wmtb.Day" select="root"/>
     127      <gsf:when test="exists"><gsf:metadata name="wmtb.Day" select="root"/>/</gsf:when>
     128    </gsf:switch>
     129    <gsf:switch>
     130      <gsf:metadata name="wmtb.Month" select="root"/>
     131      <gsf:when test="exists"><gsf:metadata name="wmtb.Month" select="root"/>/</gsf:when>
     132    </gsf:switch>
     133    <gsf:switch>
     134      <gsf:metadata name="wmtb.Year" select="root"/>
    136135      <gsf:when test="exists">
    137         <gsf:metadata name="wmtb.Year"/>
     136        <gsf:metadata name="wmtb.Year" select="root"/>
    138137      </gsf:when>
    139138    </gsf:switch>
    140139    <gsf:switch>
    141       <gsf:metadata name="wmtb.Type"/>
    142       <gsf:when test="exists"><br/> Type: <gsf:metadata name="wmtb.Type"/></gsf:when>
    143     </gsf:switch>
    144     <gsf:switch>
    145       <gsf:metadata name="Source"/>
     140      <gsf:metadata name="wmtb.Type" select="root"/>
     141      <gsf:when test="exists"><br/> Type: <gsf:metadata name="wmtb.Type" select="root"/></gsf:when>
     142    </gsf:switch>
     143    <gsf:switch>
     144      <gsf:metadata name="Source" select="root"/>
    146145      <gsf:when test="exists">
    147146        <br/>
    148         <i>(<gsf:metadata name="Source"/>)</i>
     147        <i>(<gsf:metadata name="Source" select="root"/>)</i>
    149148      </gsf:when>
    150149    </gsf:switch>
    … …  
    182181            <displayItem lang="en" name="name">section</displayItem>
    183182        </level>
    184         <defaultLevel name="document"/>
     183        <defaultLevel name="section"/>
    185184        <index name="allfields">
    186185            <displayItem lang="en" name="name">all</displayItem>
    … …  
    256255    </td>
    257256    <td>
    258       <gsf:link type="document">
    259         <xsl:call-template name="choose-title"/>
    260       </gsf:link>
     257      <gsf:switch>
     258        <gsf:metadata name="Title" select="parent"/>
     259        <gsf:when test="exists"><gsf:link type="document"><xsl:call-template name="choose-title"/></gsf:link> of <gsf:link select="root" type="document"><gsf:metadata name="wmtb.Title" select="root"/></gsf:link></gsf:when>
     260        <gsf:otherwise>
     261          <gsf:link type="document">
     262            <xsl:call-template name="choose-title"/>
     263          </gsf:link>
     264        </gsf:otherwise>
     265      </gsf:switch>
    261266      <xsl:call-template name="display-metadata"/>
    262267    </td>
    … …  
    436441    </browse>
    437442    <display>
    438         <format>
    439             <gsf:option name="TOC" value="true"/>
    440             <gsf:option name="allowUserComments" value="false"/>
    441             <gsf:option name="allowDocumentEditing" value="true"/>
    442             <gsf:option name="allowMapGPSEditing" value="true"/>
     443        <format>  <gsf:option name="TOC" value="true"/>
     444  <gsf:option name="allowUserComments" value="false"/>
     445  <gsf:option name="allowDocumentEditing" value="true"/>
     446  <gsf:option name="allowMapGPSEditing" value="true"/>
    443447<!--
    444448Overwriting this template allows you to change the heading of the document.
    … …  
    491495</gsf:template>
    492496-->
    493         </format>
     497
     498</format>
    494499    </display>
    495500    <replaceListRef id="gs2-standard"/>
    … …  
    519524        </serviceRack>
    520525    </serviceRackList>
     526    <buildOption name="remove_empty_classifications"/>
    521527</CollectionConfig>
Note: See TracChangeset for help on using the changeset viewer.