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/text-template-coll/etc/collectionConfig.xml

    r34309 r34314  
    4242    </metadataList>
    4343    <displayItemList>
    44         <displayItem assigned="true" lang="en" name="name">text template collection</displayItem>
     44        <displayItem assigned="true" lang="en" name="name">text collection template</displayItem>
    4545        <displayItem assigned="true" lang="en" name="allfields">all</displayItem>
    4646        <displayItem assigned="true" lang="en" name="text">text</displayItem>
    … …  
    4848        <displayItem assigned="true" lang="en" name="wmtb.HapuOrIwi">hapÅ« or iwi</displayItem>
    4949        <displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
    50         <displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
    51         <displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
    52         <displayItem assigned="true" lang="en" name="wmtb.Composer">composers</displayItem>
    53         <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>
    5750        <displayItem assigned="true" lang="en" name="wmtb.Year">date</displayItem>
    5851        <displayItem assigned="true" lang="en" name="wmtb.Location">location</displayItem>
    … …  
    6659        <displayItem assigned="true" lang="en" name="document">document</displayItem>
    6760        <displayItem assigned="true" lang="en" name="section">section</displayItem>
     61        <displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
     62        <displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
     63        <displayItem assigned="true" lang="en" name="wmtb.Composer">composers</displayItem>
     64        <displayItem assigned="true" lang="en" name="wmtb.Genre">genre</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 kōrero (text) only collections</displayItem>
    7271    </displayItemList>
    7372    <format>  <gsf:template name="choose-title">
    … …  
    8685-->
    8786    <gsf:switch>
    88       <gsf:metadata name="wmtb.Author"/>
    89       <gsf:when test="exists"><br/> Author(s): <gsf:metadata name="wmtb.Author"/></gsf:when>
    90     </gsf:switch>
    91     <gsf:switch>
    92       <gsf:metadata name="wmtb.HapuOrIwi"/>
    93       <gsf:when test="exists"><br/> HapÅ« or Iwi: <gsf:metadata name="wmtb.HapuOrIwi"/></gsf:when>
    94     </gsf:switch>
    95     <gsf:switch>
    96       <gsf:metadata name="wmtb.Location"/>
    97       <gsf:when test="exists"><br/> Location(s): <gsf:metadata name="wmtb.Location"/></gsf:when>
    98     </gsf:switch>
    99     <gsf:switch>
    100       <gsf:metadata name="wmtb.DateType"/>
    101       <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType"/>: </gsf:when>
     87      <gsf:metadata name="wmtb.Author" select="root"/>
     88      <gsf:when test="exists"><br/> Author(s): <gsf:metadata name="wmtb.Author" select="root"/></gsf:when>
     89    </gsf:switch>
     90    <gsf:switch>
     91      <gsf:metadata name="wmtb.HapuOrIwi" select="root"/>
     92      <gsf:when test="exists"><br/> HapÅ« or Iwi: <gsf:metadata name="wmtb.HapuOrIwi" select="root"/></gsf:when>
     93    </gsf:switch>
     94    <gsf:switch>
     95      <gsf:metadata name="wmtb.Location" select="root"/>
     96      <gsf:when test="exists"><br/> Location(s): <gsf:metadata name="wmtb.Location" select="root"/></gsf:when>
     97    </gsf:switch>
     98    <gsf:switch>
     99      <gsf:metadata name="wmtb.DateType" select="root"/>
     100      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType" select="root"/>: </gsf:when>
    102101      <gsf:otherwise><br/>Date: </gsf:otherwise>
    103102    </gsf:switch>
    104103    <gsf:switch>
    105       <gsf:metadata name="wmtb.Day"/>
    106       <gsf:when test="exists"><gsf:metadata name="wmtb.Day"/>/</gsf:when>
    107     </gsf:switch>
    108     <gsf:switch>
    109       <gsf:metadata name="wmtb.Month"/>
    110       <gsf:when test="exists"><gsf:metadata name="wmtb.Month"/>/</gsf:when>
    111     </gsf:switch>
    112     <gsf:switch>
    113       <gsf:metadata name="wmtb.Year"/>
     104      <gsf:metadata name="wmtb.Day" select="root"/>
     105      <gsf:when test="exists"><gsf:metadata name="wmtb.Day" select="root"/>/</gsf:when>
     106    </gsf:switch>
     107    <gsf:switch>
     108      <gsf:metadata name="wmtb.Month" select="root"/>
     109      <gsf:when test="exists"><gsf:metadata name="wmtb.Month" select="root"/>/</gsf:when>
     110    </gsf:switch>
     111    <gsf:switch>
     112      <gsf:metadata name="wmtb.Year" select="root"/>
    114113      <gsf:when test="exists">
    115         <gsf:metadata name="wmtb.Year"/>
     114        <gsf:metadata name="wmtb.Year" select="root"/>
    116115      </gsf:when>
    117116    </gsf:switch>
    118117    <gsf:switch>
    119       <gsf:metadata name="wmtb.Type"/>
    120       <gsf:when test="exists"><br/> Type: <gsf:metadata name="wmtb.Type"/></gsf:when>
    121     </gsf:switch>
    122     <gsf:switch>
    123       <gsf:metadata name="Source"/>
     118      <gsf:metadata name="wmtb.Type" select="root"/>
     119      <gsf:when test="exists"><br/> Type: <gsf:metadata name="wmtb.Type" select="root"/></gsf:when>
     120    </gsf:switch>
     121    <gsf:switch>
     122      <gsf:metadata name="Source" select="root"/>
    124123      <gsf:when test="exists">
    125124        <br/>
    126         <i>(<gsf:metadata name="Source"/>)</i>
     125        <i>(<gsf:metadata name="Source" select="root"/>)</i>
    127126      </gsf:when>
    128127    </gsf:switch>
    … …  
    160159            <displayItem lang="en" name="name">section</displayItem>
    161160        </level>
    162         <defaultLevel name="document"/>
     161        <defaultLevel name="section"/>
    163162        <index name="allfields">
    164163            <displayItem lang="en" name="name">all</displayItem>
    … …  
    204203        <searchType name="simpleform"/>
    205204        <searchType name="advancedform"/>
    206         <format>
    207             <gsf:template match="documentNode">
    208                 <gsf:switch>
    209                     <gsf:metadata name="FileFormat"/>
    210                     <gsf:when test="equals" test-value="video"/>
    211                     <gsf:otherwise>
    212                         <td valign="top">
    213                             <gsf:link type="document">
    214                                 <gsf:icon type="document"/>
    215                             </gsf:link>
    216                         </td>
    217                     </gsf:otherwise>
    218                 </gsf:switch>
    219                 <td valign="top">
    220                     <gsf:link type="source">
    221                         <gsf:choose-metadata>
    222                             <gsf:metadata name="thumbicon"/>
    223                             <gsf:metadata name="srcicon"/>
    224                         </gsf:choose-metadata>
    225                     </gsf:link>
    226                 </td>
    227                 <td>
    228                     <gsf:link type="document">
    229                         <xsl:call-template name="choose-title"/>
    230                     </gsf:link>
    231                     <xsl:call-template name="display-metadata"/>
    232                 </td>
    233             </gsf:template>
    234         </format>
     205        <format>  <gsf:template match="documentNode">
     206    <gsf:switch>
     207      <gsf:metadata name="FileFormat"/>
     208      <gsf:when test="equals" test-value="video"/>
     209      <gsf:otherwise>
     210        <td valign="top">
     211          <gsf:link type="document">
     212            <gsf:icon type="document"/>
     213          </gsf:link>
     214        </td>
     215      </gsf:otherwise>
     216    </gsf:switch>
     217    <td valign="top">
     218      <gsf:link type="source">
     219        <gsf:choose-metadata>
     220          <gsf:metadata name="thumbicon"/>
     221          <gsf:metadata name="srcicon"/>
     222        </gsf:choose-metadata>
     223      </gsf:link>
     224    </td>
     225   <td>
     226      <gsf:switch>
     227        <gsf:metadata name="Title" select="parent"/>
     228        <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>
     229        <gsf:otherwise>
     230          <gsf:link type="document">
     231            <xsl:call-template name="choose-title"/>
     232          </gsf:link>
     233        </gsf:otherwise>
     234      </gsf:switch>
     235      <xsl:call-template name="display-metadata"/>
     236    </td>
     237  </gsf:template>
     238
     239</format>
    235240    </search>
    236241    <infodb type="jdbm"/>
    … …  
    380385    </browse>
    381386    <display>
    382         <format>
    383             <gsf:option name="TOC" value="true"/>
    384             <gsf:option name="allowUserComments" value="false"/>
    385             <gsf:option name="allowDocumentEditing" value="true"/>
    386             <gsf:option name="allowMapGPSEditing" value="true"/>
     387        <format>  <gsf:option name="TOC" value="true"/>
     388  <gsf:option name="allowUserComments" value="false"/>
     389  <gsf:option name="allowDocumentEditing" value="true"/>
     390  <gsf:option name="allowMapGPSEditing" value="true"/>
    387391<!--
    388392Overwriting this template allows you to change the heading of the document.
    … …  
    435439</gsf:template>
    436440-->
    437         </format>
     441
     442</format>
    438443    </display>
    439444    <replaceListRef id="gs2-standard"/>
    … …  
    463468        </serviceRack>
    464469    </serviceRackList>
     470    <buildOption name="remove_empty_classifications"/>
    465471</CollectionConfig>
Note: See TracChangeset for help on using the changeset viewer.