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

    r34309 r34314  
    4242    </metadataList>
    4343    <displayItemList>
    44         <displayItem assigned="true" lang="en" name="name">image template collection</displayItem>
     44        <displayItem assigned="true" lang="en" name="name">image 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.Caption">captions</displayItem>
    5150        <displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
    … …  
    6261        <displayItem assigned="true" lang="en" name="document">document</displayItem>
    6362        <displayItem assigned="true" lang="en" name="section">section</displayItem>
     63        <displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
    6464        <displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
    6565        <displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
    … …  
    8585-->
    8686    <gsf:switch>
    87       <gsf:metadata name="wmtb.HapuOrIwi"/>
    88       <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>
    8989    </gsf:switch>
    9090<!--
    … …  
    9292-->
    9393    <gsf:switch>
    94       <gsf:metadata name="wmtb.Caption"/>
    95       <gsf:when test="exists"><br/> Caption(s): <gsf:metadata name="wmtb.Caption"/></gsf:when>
    96     </gsf:switch>
    97     <gsf:switch>
    98       <gsf:metadata name="wmtb.Photographer"/>
    99       <gsf:when test="exists"><br/> Photographer(s): <gsf:metadata name="wmtb.Photographer"/></gsf:when>
     94      <gsf:metadata name="wmtb.Caption" select="root"/>
     95      <gsf:when test="exists"><br/> Caption(s): <gsf:metadata name="wmtb.Caption" select="root"/></gsf:when>
     96    </gsf:switch>
     97    <gsf:switch>
     98      <gsf:metadata name="wmtb.Photographer" select="root"/>
     99      <gsf:when test="exists"><br/> Photographer(s): <gsf:metadata name="wmtb.Photographer" select="root"/></gsf:when>
    100100    </gsf:switch>
    101101<!--
    … …  
    103103-->
    104104    <gsf:switch>
    105       <gsf:metadata name="wmtb.Width"/>
     105      <gsf:metadata name="wmtb.Width" select="root"/>
    106106      <gsf:when test="exists">
    107107        <br/>
    108108        <xsl:text>Dimensions: </xsl:text>
    109         <gsf:metadata name="wmtb.Width"/>
     109        <gsf:metadata name="wmtb.Width" select="root"/>
    110110        <xsl:text> w x</xsl:text>
    111111        <gsf:switch>
    112           <gsf:metadata name="wmtb.Height"/>
    113           <gsf:when test="exists"> <gsf:metadata name="wmtb.Height"/>h</gsf:when>
     112          <gsf:metadata name="wmtb.Height" select="root"/>
     113          <gsf:when test="exists"> <gsf:metadata name="wmtb.Height" select="root"/>h</gsf:when>
    114114          <gsf:otherwise> ?h</gsf:otherwise>
    115115        </gsf:switch>
    116116        <gsf:switch>
    117           <gsf:metadata name="wmtb.Units"/>
    118           <gsf:when test="exists"> <gsf:metadata name="wmtb.Units"/> units</gsf:when>
     117          <gsf:metadata name="wmtb.Units" select="root"/>
     118          <gsf:when test="exists"> <gsf:metadata name="wmtb.Units" select="root"/> units</gsf:when>
    119119        </gsf:switch>
    120120        <gsf:switch>
    121           <gsf:metadata name="wmtb.Size"/>
    122           <gsf:when test="exists"> (size:<gsf:metadata name="wmtb.Size"/>)</gsf:when>
     121          <gsf:metadata name="wmtb.Size" select="root"/>
     122          <gsf:when test="exists"> (size:<gsf:metadata name="wmtb.Size" select="root"/>)</gsf:when>
    123123        </gsf:switch>
    124124      </gsf:when>
    … …  
    128128-->
    129129    <gsf:switch>
    130       <gsf:metadata name="wmtb.Location"/>
    131       <gsf:when test="exists"><br/> Location(s): <gsf:metadata name="wmtb.Location"/></gsf:when>
    132     </gsf:switch>
    133     <gsf:switch>
    134       <gsf:metadata name="wmtb.DateType"/>
    135       <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType"/>: </gsf:when>
     130      <gsf:metadata name="wmtb.Location" select="root"/>
     131      <gsf:when test="exists"><br/> Location(s): <gsf:metadata name="wmtb.Location" select="root"/></gsf:when>
     132    </gsf:switch>
     133    <gsf:switch>
     134      <gsf:metadata name="wmtb.DateType" select="root"/>
     135      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType" select="root"/>: </gsf:when>
    136136      <gsf:otherwise><br/>Date: </gsf:otherwise>
    137137    </gsf:switch>
    138138    <gsf:switch>
    139       <gsf:metadata name="wmtb.Day"/>
    140       <gsf:when test="exists"><gsf:metadata name="wmtb.Day"/>/</gsf:when>
    141     </gsf:switch>
    142     <gsf:switch>
    143       <gsf:metadata name="wmtb.Month"/>
    144       <gsf:when test="exists"><gsf:metadata name="wmtb.Month"/>/</gsf:when>
    145     </gsf:switch>
    146     <gsf:switch>
    147       <gsf:metadata name="wmtb.Year"/>
     139      <gsf:metadata name="wmtb.Day" select="root"/>
     140      <gsf:when test="exists"><gsf:metadata name="wmtb.Day" select="root"/>/</gsf:when>
     141    </gsf:switch>
     142    <gsf:switch>
     143      <gsf:metadata name="wmtb.Month" select="root"/>
     144      <gsf:when test="exists"><gsf:metadata name="wmtb.Month" select="root"/>/</gsf:when>
     145    </gsf:switch>
     146    <gsf:switch>
     147      <gsf:metadata name="wmtb.Year" select="root"/>
    148148      <gsf:when test="exists">
    149         <gsf:metadata name="wmtb.Year"/>
     149        <gsf:metadata name="wmtb.Year" select="root"/>
    150150      </gsf:when>
    151151    </gsf:switch>
    152152    <gsf:switch>
    153       <gsf:metadata name="wmtb.Type"/>
    154       <gsf:when test="exists"><br/> Type: <gsf:metadata name="wmtb.Type"/></gsf:when>
    155     </gsf:switch>
    156     <gsf:switch>
    157       <gsf:metadata name="Source"/>
     153      <gsf:metadata name="wmtb.Type" select="root"/>
     154      <gsf:when test="exists"><br/> Type: <gsf:metadata name="wmtb.Type" select="root"/></gsf:when>
     155    </gsf:switch>
     156    <gsf:switch>
     157      <gsf:metadata name="Source" select="root"/>
    158158      <gsf:when test="exists">
    159159        <br/>
    160         <i>(<gsf:metadata name="Source"/>)</i>
     160        <i>(<gsf:metadata name="Source" select="root"/>)</i>
    161161      </gsf:when>
    162162    </gsf:switch>
    … …  
    194194            <displayItem lang="en" name="name">section</displayItem>
    195195        </level>
    196         <defaultLevel name="document"/>
     196        <defaultLevel name="section"/>
    197197        <index name="allfields">
    198198            <displayItem lang="en" name="name">all</displayItem>
    … …  
    265265    </td>
    266266    <td>
    267       <gsf:link type="document">
    268         <xsl:call-template name="choose-title"/>
    269       </gsf:link>
     267      <gsf:switch>
     268        <gsf:metadata name="Title" select="parent"/>
     269        <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>
     270        <gsf:otherwise>
     271          <gsf:link type="document">
     272            <xsl:call-template name="choose-title"/>
     273          </gsf:link>
     274        </gsf:otherwise>
     275      </gsf:switch>
    270276      <xsl:call-template name="display-metadata"/>
    271277    </td>
    … …  
    370376            <option name="-buttonname" value="Source"/>
    371377        </classifier>
    372         <format>
    373             <gsf:template match="documentNode">
    374                 <gsf:switch>
    375                     <gsf:metadata name="FileFormat"/>
    376                     <gsf:when test="equals" test-value="video"/>
    377                     <gsf:otherwise>
    378                         <td valign="top">
    379                             <gsf:link type="document">
    380                                 <gsf:icon type="document"/>
    381                             </gsf:link>
    382                         </td>
    383                     </gsf:otherwise>
    384                 </gsf:switch>
    385                 <td valign="top">
    386                     <gsf:link type="source">
    387                         <gsf:choose-metadata>
    388                             <gsf:metadata name="thumbicon"/>
    389                             <gsf:metadata name="srcicon"/>
    390                         </gsf:choose-metadata>
    391                     </gsf:link>
    392                 </td>
    393                 <td valign="top">
    394                     <gsf:metadata name="equivDocLink"/>
    395                     <gsf:metadata name="equivDocIcon"/>
    396                     <gsf:metadata name="/equivDocLink"/>
    397                 </td>
    398                 <td valign="top">
    399                     <gsf:link type="document">
     378        <format>  <gsf:template match="documentNode">
     379    <gsf:switch>
     380      <gsf:metadata name="FileFormat"/>
     381      <gsf:when test="equals" test-value="video"/>
     382      <gsf:otherwise>
     383        <td valign="top">
     384          <gsf:link type="document">
     385            <gsf:icon type="document"/>
     386          </gsf:link>
     387        </td>
     388      </gsf:otherwise>
     389    </gsf:switch>
     390    <td valign="top">
     391      <gsf:link type="source">
     392        <gsf:choose-metadata>
     393          <gsf:metadata name="thumbicon"/>
     394          <gsf:metadata name="srcicon"/>
     395        </gsf:choose-metadata>
     396      </gsf:link>
     397    </td>
     398    <td valign="top">
     399      <gsf:metadata name="equivDocLink"/>
     400      <gsf:metadata name="equivDocIcon"/>
     401      <gsf:metadata name="/equivDocLink"/>
     402    </td>
     403    <td valign="top">
     404      <gsf:link type="document">
    400405<!--
    401406Defined in the global format statement
    402407-->
    403                         <xsl:call-template name="choose-title"/>
    404                     </gsf:link>
    405                     <xsl:call-template name="display-metadata"/>
    406                 </td>
    407             </gsf:template>
    408             <gsf:template match="classifierNode[@classifierStyle = 'VList']">
    409                 <td valign="top">
    410                     <gsf:link style="static" type="classifier">
    411                         <gsf:icon type="classifier"/>
    412                     </gsf:link>
    413                 </td>
    414                 <td valign="top">
    415                     <gsf:link type="classifier">
    416                         <gsf:metadata name="Title"/>
    417                     </gsf:link>
    418                 </td>
    419             </gsf:template>
    420             <gsf:template match="classifierNode[@classifierStyle = 'HList']">
    421                 <gsf:link style="static" type="classifier">
    422                     <gsf:metadata name="Title"/>
    423                 </gsf:link>
    424             </gsf:template>
    425         </format>
     408        <xsl:call-template name="choose-title"/>
     409      </gsf:link>
     410      <xsl:call-template name="display-metadata"/>
     411    </td>
     412  </gsf:template>
     413  <gsf:template match="classifierNode[@classifierStyle = 'VList']">
     414    <td valign="top">
     415      <gsf:link style="static" type="classifier">
     416        <gsf:icon type="classifier"/>
     417      </gsf:link>
     418    </td>
     419    <td valign="top">
     420      <gsf:link type="classifier">
     421        <gsf:metadata name="Title"/>
     422      </gsf:link>
     423    </td>
     424  </gsf:template>
     425  <gsf:template match="classifierNode[@classifierStyle = 'HList']">
     426    <gsf:link style="static" type="classifier">
     427      <gsf:metadata name="Title"/>
     428    </gsf:link>
     429  </gsf:template>
     430
     431</format>
    426432    </browse>
    427433    <display>
    … …  
    509515        </serviceRack>
    510516    </serviceRackList>
     517    <buildOption name="remove_empty_classifications"/>
    511518</CollectionConfig>
Note: See TracChangeset for help on using the changeset viewer.