From e3b3b75752618a3a053d69af34aa529bf90112eb Mon Sep 17 00:00:00 2001
From: xtof <christophe.mcr@gmail.com>
Date: Sun, 4 Nov 2018 22:56:16 +0100
Subject: [PATCH] Add google Analytics

---
 Data/AmateurSatellites.xsd             | 19 ++++++-
 Templates/XSLT/HtmlFileDescription.xsl | 74 ++++++++++++++------------
 Templates/XSLT/SplitAmsatListFile.xsl  |  2 +
 scripts/HtmlDescriptionPage.bat        |  2 +-
 4 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/Data/AmateurSatellites.xsd b/Data/AmateurSatellites.xsd
index a522a97..67afd7a 100644
--- a/Data/AmateurSatellites.xsd
+++ b/Data/AmateurSatellites.xsd
@@ -1,3 +1,11 @@
+
+
+<xs:schema  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://www.josast.org/test/jaxb"
+            xmlns:tns="http://www.josast.org/test/jaxb"
+            elementFormDefault="qualified"> 
+
+
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:element name="AmsatList" type="AmsatListType"/>
 
@@ -17,6 +25,7 @@
         <xs:enumeration value="230000"/>
       </xs:restriction>
     </xs:simpleType>
+</xs:element>
 
   <xs:element name="Status">
         <xs:simpleType>
@@ -37,7 +46,7 @@
         </xs:simpleType>
       </xs:element>
 	  
-  <xs:element name="Mode" minOccurs="0">
+  <xs:element name="Mode"  >
         <xs:simpleType>
           <xs:restriction base="xs:string">
             <xs:enumeration value="SSB/CW"/>
@@ -145,13 +154,19 @@
       <xs:element type="xs:string" name="Title"/>
       <xs:element type="xs:string" name="Value"/>
     </xs:sequence>
+  </xs:complexType>
+    <xs:complexType name="SoftwareURLType">
+    <xs:sequence>
+      <xs:element type="xs:string" name="Title"/>
+      <xs:element type="xs:string" name="Value"/>
+    </xs:sequence>
   </xs:complexType>
   <xs:complexType name="TelemetryDataType">
     <xs:sequence>
       <xs:element type="DescriptionURLType" name="DescriptionURL" maxOccurs="unbounded" minOccurs="0"/>
       <xs:element type="ReportURLType" name="ReportURL" minOccurs="0"/>
       <xs:element type="xs:string" name="ReportEmail" minOccurs="0"/>
-      <xs:element type="xs:string" name="SoftwareURL" minOccurs="0"/>
+      <xs:element type="SoftwareURLType" name="SoftwareURL" minOccurs="0"/>
       <xs:element type="xs:string" name="Description" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
diff --git a/Templates/XSLT/HtmlFileDescription.xsl b/Templates/XSLT/HtmlFileDescription.xsl
index 06a26f1..fe73e29 100644
--- a/Templates/XSLT/HtmlFileDescription.xsl
+++ b/Templates/XSLT/HtmlFileDescription.xsl
@@ -6,6 +6,16 @@
     <head>
         <meta charset="utf-8"> </meta>
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> </meta>
+		<!-- Global site tag (gtag.js) - Google Analytics -->
+<script  src="https://www.googletagmanager.com/gtag/js?id=UA-128629404-1" async="true" ></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-128629404-1');
+</script>
+
         <title>AMSAT SATELLITE LIST</title>
         <meta name="description" content=""></meta>
         <meta name="viewport" content="width=device-width, initial-scale=1"></meta>
@@ -45,7 +55,7 @@
 		 
 		   <tr  class="c0">
 				<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
-				<td> <a href="SatellitePage/{NasaID}.htm"><xsl:value-of select="Name"/></a></td>
+				<td> <a href="SatellitePage/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
 				<td> <xsl:value-of select="NasaID"/></td>
 				<td> <xsl:apply-templates select="Status"/> </td>
 				</tr>
@@ -64,7 +74,7 @@
 		 
 		   <tr  class="c0">
 				<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
-				<td> <a href="SatellitePage/{NasaID}.htm"><xsl:value-of select="Name"/></a></td>
+				<td> <a href="SatellitePage/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
 				<td> <xsl:value-of select="NasaID"/></td>
 				<td> <xsl:apply-templates select="Status"/> </td>
 				<td> <xsl:apply-templates select="RadioData/Beacons/Frequency"/> </td>
@@ -85,7 +95,7 @@
 		 
 		   <tr  class="c0">
 				<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
-				<td> <a href="SatellitePage/{NasaID}.htm"><xsl:value-of select="Name"/></a></td>
+				<td> <a href="SatellitePage/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
 				<td> <xsl:value-of select="NasaID"/></td>
 				<td> <xsl:apply-templates select="Status"/> </td>
 				</tr>
@@ -113,15 +123,7 @@
         <script src="initializr/js/plugins.js"></script>
         <script src="initializr/js/main.js"></script>
 
-        <!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
-        <script>
-            (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
-            function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
-            e=o.createElement(i);r=o.getElementsByTagName(i)[0];
-            e.src='//www.google-analytics.com/analytics.js';
-            r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
-            ga('create','UA-XXXXX-X','auto');ga('send','pageview');
-        </script>
+        
     </body>
 	
 	
@@ -137,7 +139,7 @@
 </xsl:template>
 
   <xsl:template match="Satellites">
-    <xsl:result-document format="html" encoding="UTF-8" href="SatellitePage/{NasaID}.htm" >
+    <xsl:result-document format="html" encoding="UTF-8" href="SatellitePage/{NasaID}{Name}.htm" >
 
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
 <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8" lang=""> <![endif]-->
@@ -146,6 +148,16 @@
     
 
 	<head>
+	<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async="true" src="https://www.googletagmanager.com/gtag/js?id=UA-128629404-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-128629404-1');
+</script>
+
        	        <meta charset="utf-8"> </meta>
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> </meta>
         <title><xsl:value-of select="./Name"/></title>
@@ -204,8 +216,13 @@
                           <h2>Radio</h2>
 						  <h3>Beacon</h3>
 						  <td> <xsl:apply-templates select="RadioData/Beacons"/></td>
-						  <h3>Transponder</h3>
+					
+						  
+						<xsl:if test="(RadioData/Transponders)">
+							 <h3>Transponder</h3>
 							<td> <xsl:apply-templates select="RadioData/Transponders"/></td>	
+							</xsl:if>
+							
                                 
             </section>
 			<section class="Telemetry">
@@ -236,14 +253,7 @@
  
         <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
 		<script src="../initializr/js/plugins.js"></script><script src="initializr/js/main.js"></script>
-		<script>
-            (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
-            function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
-            e=o.createElement(i);r=o.getElementsByTagName(i)[0];
-            e.src='//www.google-analytics.com/analytics.js';
-            r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
-            ga('create','UA-XXXXX-X','auto');ga('send','pageview');
-        </script>
+		
     </body>
 </html>
 
@@ -252,7 +262,7 @@
 
  <xsl:template match="RadioData/Beacons">
     <h4>Name :  <xsl:value-of select="Name"/></h4>
-	 <li><b>Frequency :</b><xsl:value-of select='format-number(number(Frequency), "###,###.##")' />  <xsl:text>  Hz  </xsl:text> </li> 
+	 <li><b>Frequency :</b><xsl:value-of select='format-number(number(Frequency) div 1000000, "###,###.###")' />  <xsl:text>  MHz  </xsl:text> </li> 
 	 <li><b>Mode :</b><xsl:apply-templates select="Modes"/> </li>
 </xsl:template>
 
@@ -263,17 +273,17 @@
 
 <xsl:template match="RadioData/Transponders">
     <h4>Name :  <xsl:value-of select="Name"/></h4>
-	<li><b>Uplink :</b>  <xsl:value-of select='format-number(number(FrequencyUplink/FrequencyBegin), "###,###.##")' />  <xsl:text>  Hz  </xsl:text> 
+	<li><b>Uplink :</b>  <xsl:value-of select='format-number(number(FrequencyUplink/FrequencyBegin) div 1000000, "###,###.###")' />  <xsl:text>  MHzHz  </xsl:text> 
 	<xsl:if test="FrequencyUplink/FrequencyEnd">
 	
 				<xsl:text> - </xsl:text> 
-				<xsl:value-of select='format-number(number(FrequencyUplink/FrequencyEnd), "###,###.##")' />  <xsl:text>  Hz </xsl:text> 
+				<xsl:value-of select='format-number(number(FrequencyUplink/FrequencyEnd) div 1000000, "###,###.###")' />  <xsl:text>  MHzHz </xsl:text> 
 	</xsl:if>	</li>
 		
-	<li><b>Downlink :</b>  <xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyBegin), "###,###.##")' />  <xsl:text>  Hz  </xsl:text> 
+	<li><b>Downlink :</b>  <xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyBegin) div 1000000, "###,###.###")' />  <xsl:text>  MHz  </xsl:text> 
 	<xsl:if test="FrequencyDownlink/FrequencyEnd">
 				<xsl:text> - </xsl:text> 
-				<xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyEnd), "###,###.##")' />  <xsl:text>  Hz </xsl:text> 		
+				<xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyEnd) div 1000000, "###,###.###")' />  <xsl:text>  MHz </xsl:text> 		
 	</xsl:if> </li>	
 	<xsl:if test="Inverted">
 		<li><b>Inverted  : </b><xsl:apply-templates select="Inverted"/></li> 	
@@ -293,20 +303,18 @@
 
 <xsl:template match="Information">
 
-		
+		<xsl:text> Link :  </xsl:text> <a href="{./Value}"><xsl:value-of select="./Title"/></a>
 		 <xsl:for-each select="Description">
 		 <xsl:choose>
 		  <xsl:when test="contains(current()/@lang,'EN')"> 
 		<p>
 			<xsl:value-of select="current()"/> <br/>
 			</p>
+			
 					</xsl:when>
 					</xsl:choose>
-	</xsl:for-each>
-	 <p>
-			<xsl:text> Link :  </xsl:text> <a href="{Information/Value}"><xsl:value-of select="Information/DescTitle"/></a>
-		</p>
-
+	
+</xsl:for-each>
 </xsl:template>
 
 
diff --git a/Templates/XSLT/SplitAmsatListFile.xsl b/Templates/XSLT/SplitAmsatListFile.xsl
index d1bac54..31902db 100644
--- a/Templates/XSLT/SplitAmsatListFile.xsl
+++ b/Templates/XSLT/SplitAmsatListFile.xsl
@@ -5,7 +5,9 @@
 <xsl:template match="/"> <!-- Match the root -->
   <xsl:for-each select="AmsatList/Satellites">
     <xsl:result-document method="xml" href="satellite_{NasaID}_{Name}.xml">
+	<AmsatList>
           <xsl:copy-of select="../@* | ." />
+		  </AmsatList>
     </xsl:result-document>
   </xsl:for-each>
 </xsl:template> 
diff --git a/scripts/HtmlDescriptionPage.bat b/scripts/HtmlDescriptionPage.bat
index a4a7536..9bcafc5 100644
--- a/scripts/HtmlDescriptionPage.bat
+++ b/scripts/HtmlDescriptionPage.bat
@@ -1 +1 @@
-java  -jar C:\projet\SaxonHE9-8-0-14J\saxon9he.jar -s:../data/AmateurSatellites.xml -xsl:../Templates/XSLT/HtmlFileDescription.xsl -o:../site/index.html
\ No newline at end of file
+java  -jar C:\projet\SaxonHE9-8-0-14J\saxon9he.jar -s:../data/AmsatList.xml -xsl:../Templates/XSLT/HtmlFileDescription.xsl -o:../site/index.html
\ No newline at end of file
-- 
GitLab

