From a9a6e85aff99193058096e845b5f16bef8bfbc82 Mon Sep 17 00:00:00 2001
From: Ben Webb <bjwebb67@googlemail.com>
Date: Wed, 4 Feb 2015 18:15:37 +0000
Subject: [PATCH] [#8] Remove obsoletion messages from FileFormat list

---
 convert.py         |  2 +-
 xml/FileFormat.xml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/convert.py b/convert.py
index 3616fe5e..bdfd219d 100644
--- a/convert.py
+++ b/convert.py
@@ -40,7 +40,7 @@ def indent(elem, level=0, shift=2):
         codelist_item = ET.Element('codelist-item')
 
         code = ET.Element('code')
-        code.text = registry_id + '/' + record.find('{http://www.iana.org/assignments}name').text
+        code.text = registry_id + '/' + record.find('{http://www.iana.org/assignments}name').text.split(' ')[0]
         codelist_item.append(code)
 
         category = ET.Element('category')
diff --git a/xml/FileFormat.xml b/xml/FileFormat.xml
index 416c61c4..cdc18755 100644
--- a/xml/FileFormat.xml
+++ b/xml/FileFormat.xml
@@ -1074,7 +1074,7 @@
             <category>application</category>
         </codelist-item>
         <codelist-item>
-            <code>application/smil - OBSOLETED in favor of application/smil+xml</code>
+            <code>application/smil</code>
             <category>application</category>
         </codelist-item>
         <codelist-item>
@@ -1370,7 +1370,7 @@
             <category>application</category>
         </codelist-item>
         <codelist-item>
-            <code>application/vnd.arastra.swi - OBSOLETED in favor of application/vnd.aristanetworks.swi</code>
+            <code>application/vnd.arastra.swi</code>
             <category>application</category>
         </codelist-item>
         <codelist-item>
@@ -2042,7 +2042,7 @@
             <category>application</category>
         </codelist-item>
         <codelist-item>
-            <code>application/vnd.geocube+xml - OBSOLETED by request</code>
+            <code>application/vnd.geocube+xml</code>
             <category>application</category>
         </codelist-item>
         <codelist-item>
@@ -2078,7 +2078,7 @@
             <category>application</category>
         </codelist-item>
         <codelist-item>
-            <code>application/vnd.gmx - DEPRECATED</code>
+            <code>application/vnd.gmx</code>
             <category>application</category>
         </codelist-item>
         <codelist-item>
@@ -2290,7 +2290,7 @@
             <category>application</category>
         </codelist-item>
         <codelist-item>
-            <code>application/vnd.informix-visionary - OBSOLETED in favor of application/vnd.visionary</code>
+            <code>application/vnd.informix-visionary</code>
             <category>application</category>
         </codelist-item>
         <codelist-item>
@@ -2930,7 +2930,7 @@
             <category>application</category>
         </codelist-item>
         <codelist-item>
-            <code>application/vnd.nokia.n-gage.symbian.install - OBSOLETE; no replacement given</code>
+            <code>application/vnd.nokia.n-gage.symbian.install</code>
             <category>application</category>
         </codelist-item>
         <codelist-item>
@@ -4434,7 +4434,7 @@
             <category>application</category>
         </codelist-item>
         <codelist-item>
-            <code>application/xhtml-voice+xml - OBSOLETE; no replacement given</code>
+            <code>application/xhtml-voice+xml</code>
             <category>application</category>
         </codelist-item>
         <codelist-item>
@@ -5022,7 +5022,7 @@
             <category>audio</category>
         </codelist-item>
         <codelist-item>
-            <code>audio/vnd.qcelp - DEPRECATED in favor of audio/qcelp</code>
+            <code>audio/vnd.qcelp</code>
             <category>audio</category>
         </codelist-item>
         <codelist-item>
@@ -5286,7 +5286,7 @@
             <category>message</category>
         </codelist-item>
         <codelist-item>
-            <code>message/news - OBSOLETED by RFC5537</code>
+            <code>message/news</code>
             <category>message</category>
         </codelist-item>
         <codelist-item>
@@ -5314,7 +5314,7 @@
             <category>message</category>
         </codelist-item>
         <codelist-item>
-            <code>message/vnd.si.simp - OBSOLETED by request</code>
+            <code>message/vnd.si.simp</code>
             <category>message</category>
         </codelist-item>
         <codelist-item>
@@ -5486,7 +5486,7 @@
             <category>text</category>
         </codelist-item>
         <codelist-item>
-            <code>text/directory - DEPRECATED by RFC6350</code>
+            <code>text/directory</code>
             <category>text</category>
         </codelist-item>
         <codelist-item>
@@ -5494,7 +5494,7 @@
             <category>text</category>
         </codelist-item>
         <codelist-item>
-            <code>text/ecmascript - OBSOLETED in favor of application/ecmascript</code>
+            <code>text/ecmascript</code>
             <category>text</category>
         </codelist-item>
         <codelist-item>
@@ -5522,7 +5522,7 @@
             <category>text</category>
         </codelist-item>
         <codelist-item>
-            <code>text/javascript - OBSOLETED in favor of application/javascript</code>
+            <code>text/javascript</code>
             <category>text</category>
         </codelist-item>
         <codelist-item>
@@ -5530,7 +5530,7 @@
             <category>text</category>
         </codelist-item>
         <codelist-item>
-            <code>text/markdown (TEMPORARY - registered 2014-11-11, expires 2015-11-11)</code>
+            <code>text/markdown</code>
             <category>text</category>
         </codelist-item>
         <codelist-item>
@@ -5706,7 +5706,7 @@
             <category>text</category>
         </codelist-item>
         <codelist-item>
-            <code>text/vnd.si.uricatalogue - OBSOLETED by request</code>
+            <code>text/vnd.si.uricatalogue</code>
             <category>text</category>
         </codelist-item>
         <codelist-item>