wkiri · wkiri · Jul 31, 2022 · Jul 31, 2022 · Jul 31, 2022 · Jul 31, 2022
diff --git a/ref/MER/MERB-aliases.csv b/ref/MER/MERB-aliases.csv
@@ -0,0 +1,140 @@
+Ada,Ada_Crater
+Bi,Block_Island
+Bernallio,Bernalillo
+Berrybowl,Berry_Bowl
+Berrybowl_Empty,Berry_Bowl_Empty
+Berrybowl_Full,Berry_Bowl_Full
+"Berry_Bowl,_Empty",Berry_Bowl_Empty
+Boabab,Baobab
+Bouncerock,Bounce_Rock
+Brian_Choice,Brian's_Choice
+Burns,Burns_Formation
+Burnsfm,Burns_Formation
+Burns_Fm,Burns_Formation
+Cape_St_Vincent,Cape_St._Vincent
+Capes_Tribulation,Cape_Tribulation
+Capes_York,Cape_York
+Concepcion,Concepción_Crater
+Concepción,Concepción_Crater
+Cookies'n_Cream,Cookies_'n_Cream
+Cy,Cape_York
+Dogpark,Dog_Park
+Donald_A_Hall,Donald_A._Hall
+Eagle,Eagle_Crater
+E_Cann,E._Cann
+Endeavor,Endeavour_Crater
+Endeavor_Crater,Endeavour_Crater
+Endeavour,Endeavour_Crater
+Endeavour_Crater's_Rim,Endeavour_Crater_Rim
+Endeavour_Rim,Endeavour_Crater_Rim
+Endeavour's_Rim,Endeavour_Crater_Rim
+Endurance,Endurance_Crater
+Erebus,Erebus_Crater
+Erebus_Rim,Erebus_Crater_Rim
+Espérance,Esperance
+Flatrock,Flat_Rock
+Fram,Fram_Crater
+Fredripple,Fred_Ripple
+Fruitbasket,Fruit_Basket
+Gallgo,Gallego
+Grasberg,Grasberg_Formation
+Grasberg_Fm,Grasberg_Formation
+Greeley_Haven,Greeley_Winter_Haven
+Gudalupe,Guadalupe
+Harold_M_Bixby,Harold_M._Bixby
+Heat_Shield,Heat_Shield_Rock
+Heat_Shield_Rock,Heat_Shield_Rock
+Heatshield,Heat_Shield_Rock
+Heatshield_Rock,Heat_Shield_Rock
+Hematrench_1,Hema_Trench_1
+Hematrenchwall_2,Hema_Trench_Wall_2
+Hs,Heat_Shield_Rock
+Hsr,Heat_Shield_Rock
+Iazu,Iazu_Crater
+Intrepid,Intrepid_Crater
+Jackrussell,Jack_Russell
+Jack_Russel,Jack_Russell
+Kaikos,Kaikos_Crater
+Kaikos_Cluster,Kaikos_Crater_Cluster
+Knudson_Ridge,Knudsen_Ridge
+Lemonrind,Lemon_Rind
+Lindberg_Mound,Lindbergh_Mound
+Lionstone,Lion_Stone
+Mackinac,Mackinac_Island
+Marathon,Marathon_Valley
+Marquette,Marquette_Island
+Matiejvic_Formation,Matijevic_Formation
+Matijevic,Matijevic_Formation
+Matijevic_Fm,Matijevic_Formation
+Matijevic_Hills,Matijevic_Hill
+Matjevic_Formation,Matijevic_Formation
+Matjievic_Formation,Matijevic_Formation
+Mckiitrick,Mckittrick
+Meridian_Planum,Meridiani_Planum
+Meridiani_Plaunum,Meridiani_Planum
+Messila,Mesilla
+Mi,Mackinac_Island
+Mp,Meridiani_Planum
+Mr,Murray_Ridge
+Murray,Murray_Ridge
+Murray_Rudge,Murray_Ridge
+Nimrod,Nimrod_Crater
+Odyssey,Odyssey_Crater
+Oileán,Oileán_Ruaidh
+Perseverance,Perseverance_Valley
+Pi,Pinnacle_Island
+Pinaut,Pierre_Pinaut
+Pinnicle_Island,Pinnacle_Island
+Purgatory,Purgatory_Dune
+Pv,Perseverance_Valley
+Realshark_Tooth,Real_Shark_Tooth
+Resolution,Resolution_Crater
+Resolution_Cluster_Craters,Resolution_Crater_Cluster
+Resolution_Cluster,Resolution_Crater_Cluster
+Rf,Roosevelt_Field
+Rim_Of_Endeavour,Rim_Of_Endeavour_Crater
+Roosevelt,Roosevelt_Field
+Rub_Al_Khali,Rub_Al_Khali_Plains
+Santacatarina,Santa_Catarina
+Santa_Maria,Santa_Maria_Crater
+Sarcobatus_Clst,Sarcobatus_Clast
+Sc,Santa_Catarina
+Scf,Sergeant_Charles_Floyd
+Sgtcfloyd,Sergeant_Charles_Floyd
+Sgtcfloyd_2,Sergeant_Charles_Floyd_2
+Sgtcfloyd_3,Sergeant_Charles_Floyd_3
+Sgt_Charles_Floyd,Sergeant_Charles_Floyd
+Sgt._Charles_Floyd,Sergeant_Charles_Floyd
+Sgt_Nathaniel_Pryor,Sergeant_Nathaniel_Prior
+Sgt._Nathaniel_Pryor,Sergeant_Nathaniel_Prior
+Shark_Tooth,Shark's_Tooth
+Shelter,Shelter_Island
+Shoemaker,Shoemaker_Formation
+Shoemaker_Fm,Shoemaker_Formation
+Shoemakers_Patio,Shoemaker's_Patio
+Si,Shelter_Island
+Siahs_Swamp,Siah's_Swamp
+Siahs_Swamp_2,Siah's_Swamp_2
+Solander_Pt,Solander_Point
+Sosl,Spirit_of_St._Louis_Crater
+Sp,Solander_Point
+Spirit_Of_Saint_Louis,Spirit_Of_Saint_Louis_Crater
+Spirit_Of_St._Louis,Spirit_Of_Saint_Louis_Crater
+Spirit_of_St._Louis_Crater,Spirit_Of_Saint_Louis_Crater
+Spongebob_Squidward,Heat_Shield_Rock
+Stewart_Island,Stuart_Island
+Stuart,Stuart_Island
+Sutherland_Pt,Sutherland_Point
+Terra_Nova,Terra_Nova_Crater
+Tickbush,Tick_Bush
+Tickbush_2,Tick_Bush_2
+Tome,Tomé
+Trenchwall_2,Hema_Trench_Wall_2
+Vermillion_Cliffs,Vermilion_Cliffs
+Victoria,Victoria_Crater
+Voskhod,Voskhod_Crater
+Vostock,Vostok_Crater
+Vostock_Crater,Vostok_Crater
+Vostok,Vostok_Crater
+Voyager,Voyager_Crater
+Wr,Wdowiak_Ridge
diff --git a/src/generate_pds4_bundle.py b/src/generate_pds4_bundle.py
@@ -294,11 +294,14 @@ def create_inventory_files(collection_dir, bundle_template_dir,
     xml_file_counter = 0
     for root, _, file_names in os.walk(collection_dir):
         for file_name in fnmatch.filter(file_names, '*.xml'):
-            xml_file_counter += 1
             file_path = os.path.join(root, file_name)
 
             lid_vid = get_lidvid(file_path)
-            inventory_csv_file.write('P,%s\r\n' % lid_vid)
+            # Require that collection name is in lid_vid
+            # This prevents mer2 files showing up in mer1 inventory
+            if collection_name in lid_vid:
+                inventory_csv_file.write('P,%s\r\n' % lid_vid)
+                xml_file_counter += 1
 
     inventory_csv_file.close()
     print '[INFO] Create inventory csv file for %s mission: %s' % \

diff --git a/src/ingest_sqlite.py b/src/ingest_sqlite.py
@@ -38,11 +38,11 @@ def read_json(jsonfile, ndocs, year=None, mission=''):
                             else [(r['text'], mission, r['begin'], r['end'])
                                   for r in rec['metadata']['ner']
                                   if r['label'] == 'Target']),
-                # Components are everything other than targets (Element, Mineral)
+                # Components are one of (Element, Mineral)
                 'components': ([] if 'ner' not in rec['metadata'].keys()
                                else [(canonical_name(r['text']), r['label'])
                                      for r in rec['metadata']['ner']
-                                     if r['label'] != 'Target']),
+                                     if r['label'] in ['Element', 'Mineral']]),
                 'contains': ([] if 'rel' not in rec['metadata'].keys()
                              else [([t for t in r['target_names']],
                                     r['target_ids'],

diff --git a/src/pds4_bundle_template/bundle_mars_target_encyclopedia.txml b/src/pds4_bundle_template/bundle_mars_target_encyclopedia.txml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1E00.xsd">
     <Identification_Area>
         <logical_identifier>urn:nasa:pds:mars_target_encyclopedia</logical_identifier>
-        <version_id>2.0</version_id>
+        <version_id>3.1</version_id>
         <title>Mars Target Encyclopedia Database Bundle</title>
         <information_model_version>1.14.0.0</information_model_version>
         <product_class>Product_Bundle</product_class>
@@ -22,6 +22,18 @@
         <Modification_History>
             <Modification_Detail>
                 <modification_date>$today</modification_date>
+                <version_id>3.1</version_id>
+                <description>Update aliases and targets tables in data_mer1 collection.
+                </description>
+            </Modification_Detail>
+            <Modification_Detail>
+                <modification_date>2022-08-08</modification_date>
+                <version_id>3.0</version_id>
+                <description>Add data_mer1 collection; minor
+                updates to the data_mer2 collection.</description>
+            </Modification_Detail>
+            <Modification_Detail>
+                <modification_date>2022-03-24</modification_date>
                 <version_id>2.0</version_id>
                 <description>Add data_mer2 collection; added aliases
                 table to data_mpf and data_phx collections.</description>

diff --git a/src/pds4_bundle_template/collection_mer1_inventory.txml b/src/pds4_bundle_template/collection_mer1_inventory.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/collection_mer2_inventory.txml b/src/pds4_bundle_template/collection_mer2_inventory.txml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1E00.xsd">
     <Identification_Area>
         <logical_identifier>urn:nasa:pds:mars_target_encyclopedia:data_mer2</logical_identifier>
-        <version_id>1.0</version_id>
+        <version_id>1.1</version_id>
         <title>Mars Target Encyclopedia MER-2 Collection</title>
         <information_model_version>1.14.0.0</information_model_version>
         <product_class>Product_Collection</product_class>
@@ -21,7 +21,14 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
+                <version_id>1.1</version_id>
+                <description>Minor updates to contains, documents,
+                has_property, mentions, properties, sentences, and
+                targets tables.</description>
+            </Modification_Detail>
+            <Modification_Detail>
+                <modification_date>2022-03-24</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/collection_mpf_inventory.txml b/src/pds4_bundle_template/collection_mpf_inventory.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-03-24</modification_date>
                 <version_id>1.3</version_id>
                 <description>Add aliases table and use ADS for
                 document metadata.</description>

diff --git a/src/pds4_bundle_template/collection_phx_inventory.txml b/src/pds4_bundle_template/collection_phx_inventory.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-03-24</modification_date>
                 <version_id>1.3</version_id>
                 <description>Add aliases table and use ADS for
                 document metadata.</description>

diff --git a/src/pds4_bundle_template/document/collection_document_inventory.txml b/src/pds4_bundle_template/document/collection_document_inventory.txml
@@ -16,7 +16,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-03-24</modification_date>
                 <version_id>1.3</version_id>
                 <description>Add mte_schema.jpg diagram and update
                 readme.txt as needed.</description>

diff --git a/src/pds4_bundle_template/document/mte_schema.txml b/src/pds4_bundle_template/document/mte_schema.txml
@@ -16,7 +16,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-03-24</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>
@@ -108,7 +108,7 @@
     </Context_Area>
     <Document>
         <document_name>Mars Target Encyclopedia Schema Diagram</document_name>
-        <publication_date>$today</publication_date>
+        <publication_date>2022-03-24</publication_date>
         <Document_Edition>
             <edition_name>Version 1.0</edition_name>
             <language>English</language>

diff --git a/src/pds4_bundle_template/document/readme.txml b/src/pds4_bundle_template/document/readme.txml
@@ -6,7 +6,7 @@
  xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1E00.xsd">
     <Identification_Area>
         <logical_identifier>urn:nasa:pds:mars_target_encyclopedia:document:readme</logical_identifier>
-        <version_id>1.3</version_id>
+        <version_id>1.4</version_id>
         <title>README of Mars Target Encyclopedia</title>
         <information_model_version>1.14.0.0</information_model_version>
         <product_class>Product_Document</product_class>
@@ -16,7 +16,12 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
+                <version_id>1.4</version_id>
+                <description>Mention new MER-1 (Opportunity) content.</description> 
+            </Modification_Detail>
+            <Modification_Detail>
+                <modification_date>2022-03-24</modification_date>
                 <version_id>1.3</version_id>
                 <description>Add description of aliases table,
                 pointer to schema diagram, and inclusion of MER-2
@@ -123,9 +128,9 @@
     </Context_Area>
     <Document>
         <document_name>README of Mars Target Encyclopedia</document_name>
-        <publication_date>$today</publication_date>
+        <publication_date>2022-08-08</publication_date>
         <Document_Edition>
-            <edition_name>Version 1.3</edition_name>
+            <edition_name>Version 1.4</edition_name>
             <language>English</language>
             <files>1</files>
             <Document_File>

diff --git a/src/pds4_bundle_template/document/readme.txt b/src/pds4_bundle_template/document/readme.txt
@@ -40,7 +40,7 @@ visual depiction of the relationships between tables.
   * The target name, for consistency, encodes spaces as underscores,
   capitalizes the first letter of each word, and ensures terminal
   numbers are separated from the name by an underscore.
-  * The mission code is "mpf", "phx", or "mer2" (Spirit).
+  * The mission code is "mpf", "phx", "mer1" (Opportunity), or "mer2" (Spirit).
   * The target id consists of the target name, a hyphen, and the mission
   code.  It allows disambiguation when a target name is used
   independently by more than one mission.

diff --git a/src/pds4_bundle_template/mer1_aliases.txml b/src/pds4_bundle_template/mer1_aliases.txml
@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1 https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1E00.xsd">
     <Identification_Area>
         <logical_identifier>urn:nasa:pds:mars_target_encyclopedia:data_mer1:aliases</logical_identifier>
-        <version_id>1.0</version_id>
+        <version_id>1.1</version_id>
         <title>MTE Mars Exploration Rover Opportunity Aliases Table</title>
         <information_model_version>1.14.0.0</information_model_version>
         <product_class>Product_Observational</product_class>
@@ -26,6 +26,11 @@
         <Modification_History>
             <Modification_Detail>
                 <modification_date>$today</modification_date>
+                <version_id>1.1</version_id>
+                <description>Add more aliases.</description>
+            </Modification_Detail>
+            <Modification_Detail>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/mer1_components.txml b/src/pds4_bundle_template/mer1_components.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/mer1_contains.txml b/src/pds4_bundle_template/mer1_contains.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/mer1_documents.txml b/src/pds4_bundle_template/mer1_documents.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/mer1_has_property.txml b/src/pds4_bundle_template/mer1_has_property.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/mer1_mentions.txml b/src/pds4_bundle_template/mer1_mentions.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>

diff --git a/src/pds4_bundle_template/mer1_properties.txml b/src/pds4_bundle_template/mer1_properties.txml
@@ -21,7 +21,7 @@
         </Citation_Information>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>$today</modification_date>
+                <modification_date>2022-08-08</modification_date>
                 <version_id>1.0</version_id>
                 <description>Initial version.</description>
             </Modification_Detail>