added index.html to collate-out folder

freud-digital · Oct 3, 2022 · ec465c8 · ec465c8
1 parent 9d0e745
commit ec465c8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/app/templates/index.html b/app/templates/index.html
@@ -45,6 +45,7 @@
             var pom_div = document.createElement('div');
             var pom_attr = `pom_div__${Date.now()}`;
             pom_div.setAttribute("id", pom_attr);
+            pom_div.style.border = "1px solid lightgrey";
             var result2 = document.getElementById('result2');
             result2.append(pom_div);
             /*
@@ -62,7 +63,8 @@
             to_collate.classList.remove("btn-primary");
             */
             var spinner = document.createElement('p');
-            spinner.setAttribute('id', 'loading');
+            var loader_attr = `loading_${Date.now()}`;
+            spinner.setAttribute('id', loader_attr);
             spinner.innerHTML = `Kollationierung läuft: ${selected.split(',')[0]} ...`;
             document.getElementById(pom_attr).append(spinner);
             $.ajax({
@@ -88,7 +90,7 @@
                   pom.innerHTML = `Kollationierung herunterladen (${selected.split(',')[0]}) `;
                   document.getElementById(pom_attr).append(pom);
 
-                  let loader = document.getElementById('loading');
+                  let loader = document.getElementById(loader_attr);
                   loader.innerHTML = `Kollationierung abgeschlossen: ${selected.split(',')[0]}`;
                   /*
                   customSelect.forEach(function(el) {

diff --git a/app/utils.py b/app/utils.py
@@ -17,13 +17,20 @@
 from app.config import XPATH, CHUNK_SIZE
 
 
+DT = datetime.now()
+TS = datetime.timestamp(DT)
+TS_STR = str(TS).replace('.', '')
+
 XSLT_FILE = os.path.join(
     os.path.dirname(__file__),
     "fixtures",
     "make_tei.xslt"
 )
 
 HTML = os.path.join(
+    "collate-out",
+    TS_STR,
+    "collated",
     "index.html"
 )
 
@@ -111,10 +118,7 @@ def collate_tei(save_path, path_dir, select):
     werk = el[1].replace('s__', '')
     manifest = el[0]
     all_manifests_pre = glob.glob(os.path.join(save_path, '*', path_dir, werk, '*.xml'))
-    dt = datetime.now()
-    ts = datetime.timestamp(dt)
-    ts_str = str(ts).replace('.', '')
-    tmp_dir = os.path.join("tmp_to_collate", ts_str)
+    tmp_dir = os.path.join("tmp_to_collate", TS_STR)
     os.makedirs(tmp_dir, exist_ok=True)
     for x in all_manifests_pre:
         tei = CxReader(
@@ -129,12 +133,12 @@ def collate_tei(save_path, path_dir, select):
             f.write(tei)
         print(f"TEI updated ({new_save_path})")
     all_manifests = os.path.join(".", tmp_dir, '*.xml')
-    col_out = os.path.join('collate-out', ts_str)
+    col_out = os.path.join('collate-out', TS_STR)
     os.makedirs(col_out, exist_ok=True)
     os.makedirs(os.path.join(col_out, 'collated'), exist_ok=True)
     output_dir = f"./{col_out}/collated"
     result_file = f'{output_dir}/collated.xml'
-    result_html = './index.html'
+    result_html = f'{output_dir}/index.html'
 
     print("starting...")
     CxCollate(