Changeset 37928 for gs3-installations/thewillow

Timestamp:

2023-08-13T00:04:35+12:00 (10 months ago)

Author:

davidb

Message:

Development of static Stories tab

Location:

gs3-installations/thewillow/trunk/sites/thewillow/collect/community-contributions

Files:

• etc/collectionConfig.xml (modified) (5 diffs)
• import/the-willow-videos/1 In The Beginning/In the Beginning.html (added)
• import/the-willow-videos/1 In The Beginning/metadata.xml (modified) (1 diff)

gs3-installations/thewillow/trunk/sites/thewillow/collect/community-contributions/etc/collectionConfig.xml

@@ -325 +325 @@
             </plugin>
             <plugin name="TextPlugin"/>
+            <plugin name="HTMLPlugin">
+              <option name="-process_exp" value="videos/.*\.html$"/>
+              <option name="-description_tags"/>
+              <option name="-associate_ext" value="mp4"/>
+            </plugin>           
             <plugin name="HTMLPlugin">
                 <option name="-associate_tail_re" value="(?:-assocwith)\.pdf$"/>
@@ -703 +708 @@
                   <xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/document/metadataList/metadata[@name='assocfilepath']" />
                 </xsl:variable>
-              
+
+                <xsl:variable name="videolinkfile">
+                  <gsf:metadata name="videolinkFile"/>
+                </xsl:variable>
+
                 <video controls="controls" style="width: 100%;">
                   <source type="video/mp4">
@@ -709 +718 @@
                       <xsl:value-of 
                    disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xsl:value-of 
-                   disable-output-escaping="yes" select="$thisAssocfilepath" />/<xsl:value-of 
-                   disable-output-escaping="yes" select="metadataList/metadata[@name='srclinkFile']" />
+                   disable-output-escaping="yes" select="$thisAssocfilepath" />/<xsl:value-of select="$videolinkfile"/><!--
+                   disable-output-escaping="yes" select="metadataList/metadata[@name='videolinkFile']" />-->
                     </xsl:attribute>
                   </source>
@@ -730 +739 @@
                         <gsf:metadata name="Plugin"/>
                         <gsf:when test="equals" test-value="HTMLPlugin">
-                          <xsl:call-template name="documentPre"/>
+                          <gsf:switch>
+                            <gsf:metadata name="tw.ObjectType"/>
+                            <gsf:when test="equals" test-value="Video">
+                              <xsl:call-template name="documentNodeVideo"/>
+                            </gsf:when>
+                            <gsf:otherwise>
+                              <xsl:call-template name="documentPre"/>
+                            </gsf:otherwise>                            
+                          </gsf:switch>                       
                         </gsf:when>
+                        
                         <gsf:when test="equals" test-value="CSVPlugin">
                           <xsl:call-template name="documentPre"/>
@@ -745 +763 @@
                             <gsf:otherwise>
                             <div id="gs-document-text">
-                                <xsl:call-template name="documentNodeText"/>
+                              <xsl:call-template name="documentNodeText"/>
                             </div>
                             </gsf:otherwise>

gs3-installations/thewillow/trunk/sites/thewillow/collect/community-contributions/import/the-willow-videos/1 In The Beginning/metadata.xml

@@ -4 +4 @@
 
     <FileSet>
-        <FileName>In the Beginning.*\.mp4$</FileName>
+        <FileName>In the Beginning.*\.html$</FileName>
         <Description>
       <Metadata name="tw.ObjectType">Video</Metadata>