From 1f3f91dfb9d07a04caf4e4dd5f6bc11f64747d43 Mon Sep 17 00:00:00 2001
From: Daniel Weschke <daniel.weschke@gmail.com>
Date: Thu, 14 Feb 2019 17:10:29 +0100
Subject: [PATCH] add two new materials and list additional information

---
 src/data/Al99.5.json                          | 36 +++++++++++++++++++
 src/data/AlMg3.json                           | 36 +++++++++++++++++++
 ...Mn0.7.json => AlMg4.5Mn0.7-G.AL-C250.json} |  0
 src/data/example.json                         |  5 ++-
 src/materials.py                              |  2 +-
 5 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100755 src/data/Al99.5.json
 create mode 100755 src/data/AlMg3.json
 rename src/data/{AlMg4.5Mn0.7.json => AlMg4.5Mn0.7-G.AL-C250.json} (100%)

diff --git a/src/data/Al99.5.json b/src/data/Al99.5.json
new file mode 100755
index 0000000..e595b4e
--- /dev/null
+++ b/src/data/Al99.5.json
@@ -0,0 +1,36 @@
+{
+  "Name": "Al99.5",
+  "Formula": "Al99.5",
+  "Standard": {
+    "ISO": "Al99.5",
+    "DIN1725": "Al99,5",
+    "EN-AW": "1050A",
+    "WERKSTOFFNUMMER": "3.0255",
+    "Type": "Pure aluminium"
+  },
+  "Mechanical Properties": {
+    "T": ["20-25", "°C"],
+    "R_m": [160, "MPa"],
+    "Hardness": {
+      "HV": [400, "0.05"]
+    },
+    "Anodising": {
+      "AH": 1,
+      "ASA": 1
+    },
+    "Annotation": "Material way too soft for mechanical processing"
+  },
+  "Source": [
+    {
+      "Type": "Web",
+      "URL": "http://www.eloxal-muenchen.de/techinfoh.html"
+    },
+    {
+      "Type": "Web",
+      "Author": "Fa. Honsel",
+      "Title": "Handbuch Knetwerkstoffe",
+      "Year": 2010,
+      "URL": "http://www.eloxal-muenchen.de/downloads/Handbuch_Knetwerkstoffe.pdf"
+    }
+  ]
+}
diff --git a/src/data/AlMg3.json b/src/data/AlMg3.json
new file mode 100755
index 0000000..c251fb6
--- /dev/null
+++ b/src/data/AlMg3.json
@@ -0,0 +1,36 @@
+{
+  "Name": "AlMg3",
+  "Formula": "AlMg3",
+  "Standard": {
+    "ISO": "AlMg3",
+    "DIN1725": "AlMg3",
+    "EN-AW": "5754",
+    "WERKSTOFFNUMMER": "3.3535",
+    "Type": "Non age hardening"
+  },
+  "Mechanical Properties": {
+    "T": ["20-25", "°C"],
+    "R_m": [305, "MPa"],
+    "Hardness": {
+      "HV": [300, "0.05"]
+    },
+    "Anodising": {
+      "AH": 1,
+      "ASA": 1
+    },
+    "Annotation": "Material is usually only available as a sheet metal"
+  },
+  "Source": [
+    {
+      "Type": "Web",
+      "URL": "http://www.eloxal-muenchen.de/techinfoh.html"
+    },
+    {
+      "Type": "Web",
+      "Author": "Fa. Honsel",
+      "Title": "Handbuch Knetwerkstoffe",
+      "Year": 2010,
+      "URL": "http://www.eloxal-muenchen.de/downloads/Handbuch_Knetwerkstoffe.pdf"
+    }
+  ]
+}
diff --git a/src/data/AlMg4.5Mn0.7.json b/src/data/AlMg4.5Mn0.7-G.AL-C250.json
similarity index 100%
rename from src/data/AlMg4.5Mn0.7.json
rename to src/data/AlMg4.5Mn0.7-G.AL-C250.json
diff --git a/src/data/example.json b/src/data/example.json
index a34f30d..56805c3 100644
--- a/src/data/example.json
+++ b/src/data/example.json
@@ -71,7 +71,10 @@
     },
     {
       "Type": "Web",
-      "URL": "http://"
+      "Author": "Fa. Honsel",
+      "Title": "Handbuch Knetwerkstoffe",
+      "Year": 2010,
+      "URL": "http://www.eloxal-muenchen.de/downloads/Handbuch_Knetwerkstoffe.pdf"
     }
   ]
 }
diff --git a/src/materials.py b/src/materials.py
index 43d4c65..ea2a65b 100755
--- a/src/materials.py
+++ b/src/materials.py
@@ -219,7 +219,7 @@ def main():
       file, _ = os.path.splitext(os.path.basename(filename))
       print(file)
       data = read_file(filename)
-      data_dict = search_keys(data, 'Name')
+      data_dict = search_keys(data, ['Name', 'EN-AW', 'WERKSTOFFNUMMER'])
       print_dict(data_dict, False, 2)
 
   elif args.command == 'get':