tidied up database generating code

CODE/.ipynb_checkpoints/generate_DISARM_pages-checkpoint.ipynb

@@ -4,27 +4,46 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Generate AMITT github files\n",
+    "# Generate DISARM github files\n",
     "\n",
-    "Generate all the AMITT github files from the AMITT master spreadsheet, being careful to reatin any comments people have made below the \"don't write above this\" line in them. "
+    "Generate all the DISARM github files from the DISARM master spreadsheets, being careful to retain any comments people have made below the \"don't write above this\" line in them. "
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {
     "scrolled": true
    },
    "outputs": [
     {
-     "ename": "ImportError",
-     "evalue": "cannot import name 'Disarm' from 'generate_DISARM_pages' (/Users/sara/Dropbox/SJT_Projects_current/DISARM_foundation/code_repositories/DISARM-Frameworks/CODE/generate_DISARM_pages.py)",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mImportError\u001b[0m                               Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-2-25052c215084>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mpandas\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mpd\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 2\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0mgenerate_DISARM_pages\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mDisarm\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      3\u001b[0m \u001b[0mdisarm\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mDisarm\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      4\u001b[0m \u001b[0mdisarm\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mgenerate_and_write_datafiles\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;31mImportError\u001b[0m: cannot import name 'Disarm' from 'generate_DISARM_pages' (/Users/sara/Dropbox/SJT_Projects_current/DISARM_foundation/code_repositories/DISARM-Frameworks/CODE/generate_DISARM_pages.py)"
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "updated ../generated_pages/disarm_red_framework.md\n",
+      "updated ../generated_files/disarm_red_framework_clickable.html\n",
+      "updated ../generated_pages/disarm_blue_framework.md\n",
+      "updated ../generated_files/disarm_blue_framework_clickable.html\n",
+      "Temp: objecttype phase\n",
+      "updated ../generated_pages/phases_index.md\n",
+      "Temp: objecttype tactic\n",
+      "updated ../generated_pages/tactics_index.md\n",
+      "Temp: objecttype technique\n",
+      "updated ../generated_pages/techniques_index.md\n",
+      "Temp: objecttype task\n",
+      "updated ../generated_pages/tasks_index.md\n",
+      "Temp: objecttype incident\n",
+      "updated ../generated_pages/incidents_index.md\n",
+      "Temp: objecttype counter\n",
+      "updated ../generated_pages/counters_index.md\n",
+      "Temp: objecttype metatechnique\n",
+      "updated ../generated_pages/metatechniques_index.md\n",
+      "Temp: objecttype actortype\n",
+      "updated ../generated_pages/actortypes_index.md\n",
+      "updated ../generated_pages/responsetype_index.md\n",
+      "updated ../generated_pages/detections_index.md\n",
+      "updated ../generated_pages/tactics_by_responsetype_table.md\n",
+      "updated ../generated_pages/metatechniques_by_responsetype_table.md\n"
      ]
     }
    ],
@@ -63,7 +82,7 @@
        "  <thead>\n",
        "    <tr style=\"text-align: right;\">\n",
        "      <th></th>\n",
-       "      <th>amitt_id</th>\n",
+       "      <th>disarm_id</th>\n",
        "      <th>name</th>\n",
        "      <th>summary</th>\n",
        "      <th>sector_ids</th>\n",
@@ -374,7 +393,7 @@
        "</div>"
       ],
       "text/plain": [
-       "   amitt_id                                name  \\\n",
+       "   disarm_id                                name  \\\n",
        "0       A001                     data scientist    \n",
        "1       A002                              target   \n",
        "2       A003                  trusted authority    \n",

CODE/generate_DISARM_pages.ipynb

@@ -4,9 +4,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Generate AMITT github files\n",
+    "# Generate DISARM github files\n",
     "\n",
-    "Generate all the AMITT github files from the AMITT master spreadsheet, being careful to reatin any comments people have made below the \"don't write above this\" line in them. "
+    "Generate all the DISARM github files from the DISARM master spreadsheets, being careful to retain any comments people have made below the \"don't write above this\" line in them. "
    ]
   },
   {