From 3cc31e1e39c44aae2d4ef6c769e8dd6cd7c54043 Mon Sep 17 00:00:00 2001
From: Matt Coarr <mcoarr@mitre.org>
Date: Thu, 7 Nov 2013 13:33:47 -0500
Subject: [PATCH 1/2] now spitting out the campign name instead of "other"

---
 stix_to_html/cybox_common.xsl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/stix_to_html/cybox_common.xsl b/stix_to_html/cybox_common.xsl
index c57d03a..ee9e4a8 100644
--- a/stix_to_html/cybox_common.xsl
+++ b/stix_to_html/cybox_common.xsl
@@ -55,6 +55,8 @@ ikirillov@mitre.org
     xmlns:et="http://stix.mitre.org/ExploitTarget-1"
     xmlns:stix='http://stix.mitre.org/stix-1'
     
+    xmlns:campaign="http://stix.mitre.org/Campaign-1"
+    
     xmlns:AddressObject='http://cybox.mitre.org/objects#AddressObject-2'
     xmlns:URIObject='http://cybox.mitre.org/objects#URIObject-2'
     xmlns:EmailMessageObj="http://cybox.mitre.org/objects#EmailMessageObject-2"
@@ -134,6 +136,10 @@ ikirillov@mitre.org
                 <xsl:variable name="output" select="if ($actualItem/coa:Type) then $actualItem/coa:Type/text() else ('[Incident, no Type]')" />
                 <xsl:value-of select="$output" />
             </xsl:when>
+            <xsl:when test="$actualItem[self::stix:Campaign]">
+                <xsl:variable name="output" select="if ($actualItem/campaign:Names/campaign:Name) then $actualItem[self::stix:Campaign]/campaign:Names/campaign:Name/text() else ('[Other Campaign]')" />
+                <xsl:value-of select="$output" />
+            </xsl:when>
             <!-- /stix -->
             <xsl:otherwise>
                 Other

From 98e2b5648a59429f327b0ec74b7c4dbf8f809a14 Mon Sep 17 00:00:00 2001
From: Matt Coarr <mcoarr@mitre.org>
Date: Thu, 7 Nov 2013 14:00:44 -0500
Subject: [PATCH 2/2] added kill chain name to main table entries

---
 stix_to_html/cybox_common.xsl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stix_to_html/cybox_common.xsl b/stix_to_html/cybox_common.xsl
index ee9e4a8..bc0c6f3 100644
--- a/stix_to_html/cybox_common.xsl
+++ b/stix_to_html/cybox_common.xsl
@@ -140,6 +140,10 @@ ikirillov@mitre.org
                 <xsl:variable name="output" select="if ($actualItem/campaign:Names/campaign:Name) then $actualItem[self::stix:Campaign]/campaign:Names/campaign:Name/text() else ('[Other Campaign]')" />
                 <xsl:value-of select="$output" />
             </xsl:when>
+            <xsl:when test="$actualItem[self::stixCommon:Kill_Chain]">
+                <xsl:variable name="output" select="if ($actualItem/@name) then fn:data($actualItem/@name) else ('[Other Kill Chain]')" />
+                <xsl:value-of select="$output" />
+            </xsl:when>
             <!-- /stix -->
             <xsl:otherwise>
                 Other