Tweaks

BSData · May 13, 2019 · 164ad1a · 164ad1a
1 parent 4bd1468
commit 164ad1a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>23</version>
+    <version>24</version>
 
     <groupId>org.battlescribedata</groupId>
     <artifactId>BattleScribeDataWeb</artifactId>

diff --git a/src/main/resources/common/java/transform/catalogue_2_02.xsl b/src/main/resources/common/java/transform/catalogue_2_02.xsl
@@ -17,7 +17,7 @@
 
             <!-- Nodes -->
             <publications>
-                <xsl:apply-templates select="//*[not(@book = '')]" mode="entry"/>
+                <xsl:apply-templates select="//*[@book]" mode="entry"/>
             </publications>
 
             <xsl:apply-templates select="node()"/>
@@ -26,9 +26,9 @@
 
 
     <!-- Publication -->
-    <xsl:key name="bookId" match="//*[not(@book = '')]" use="@book"/>
+    <xsl:key name="bookId" match="//*[@book]" use="@book"/>
     <xsl:template match="*" mode="entry">
-        <xsl:if test="generate-id() = generate-id(key('bookId', @book)[1])">
+        <xsl:if test="not(@book = '') and generate-id() = generate-id(key('bookId', @book)[1])">
             <publication>
                 <!-- Attributes -->
                 <xsl:attribute name="id"><xsl:value-of select="substring(/bsc:catalogue/@id, 1, 9)"/>-pub<xsl:value-of select="generate-id(key('bookId', @book))"/></xsl:attribute>

diff --git a/src/main/resources/common/java/transform/game_system_2_02.xsl b/src/main/resources/common/java/transform/game_system_2_02.xsl
@@ -18,7 +18,7 @@
 
             <!-- Nodes -->
             <publications>
-                <xsl:apply-templates select="//*[not(@book = '')]" mode="entry"/>
+                <xsl:apply-templates select="//*[@book]" mode="entry"/>
             </publications>
 
             <xsl:apply-templates select="node()"/>
@@ -27,9 +27,9 @@
 
 
     <!-- Publication -->
-    <xsl:key name="bookId" match="//*[not(@book = '')]" use="@book"/>
+    <xsl:key name="bookId" match="//*[@book]" use="@book"/>
     <xsl:template match="*" mode="entry">
-        <xsl:if test="generate-id() = generate-id(key('bookId', @book)[1])">
+        <xsl:if test="not(@book = '') and generate-id() = generate-id(key('bookId', @book)[1])">
             <publication>
                 <!-- Attributes -->
                 <xsl:attribute name="id"><xsl:value-of select="substring(/bsg:gameSystem/@id, 1, 9)"/>-pub<xsl:value-of select="generate-id(key('bookId', @book))"/></xsl:attribute>

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -20,8 +20,8 @@
         <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
         <link rel="stylesheet" href="app/css/normalize.css">
         <link rel="stylesheet" href="app/css/main.css">
-        <link href='http://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
-        <link href="http://fonts.googleapis.com/css?family=Roboto+Slab" rel="stylesheet" type="text/css">
+        <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Roboto+Slab" rel="stylesheet" type="text/css">
 
         <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.2/modernizr.min.js"></script>
     </head>