Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

.env.tpl

@@ -100,15 +100,23 @@ NOPAQUE_CONTACT_EMAIL_ADRESS=
 # Choose one: http, https
 # NOPAQUE_PROTOCOL=
 
-# DEFAULT: 5
-# NOPAQUE_RESSOURCES_PER_PAGE=
+# DEFAULT: True
+# Choose one: False, True
+# NOPAQUE_REMEMBER_COOKIE_HTTPONLY=
+
+# DEFAULT: False
+# Choose one: False, True
+# HINT: Set to true if you redirect http to https
+# NOPAQUE_REMEMBER_COOKIE_SECURE=
 
 # DEFAULT: hard to guess string
 # HINT: Use this bash command `python -c "import uuid; print(uuid.uuid4().hex)"`
 # NOPAQUE_SECRET_KEY=
 
-# DEFAULT: 10
-# NOPAQUE_USERS_PER_PAGE=
+# DEFAULT: False
+# Choose one: False, True
+# HINT: Set to true if you redirect http to https
+# NOPAQUE_SESSION_COOKIE_SECURE=
 
 
 ################################################################################

web/app/static/js/modules/corpus_analysis/client/callbacks.js

@@ -33,13 +33,24 @@ function prepareQueryData() {
  */
 function saveQueryData() {
   let [payload, client, results, rest] = arguments;
+  // Get data matches length before new chunk data is being inserted
   let dataLength = results.data.matches.length;
   if (client.dynamicMode) {
-    // get data matches length before new chunk data is being inserted
-    // incorporating new chunk data into full results
+    // Incorporating new chunk data into full results
     results.data.matches.push(...payload.chunk.matches);
     results.data.addData(payload.chunk.cpos_lookup, 'cpos_lookup');
     results.data.addData(payload.chunk.text_lookup, 'text_lookup');
+    console.log(payload.chunk.text_lookup);
+     /**
+      * Increment match_counts per text in a global results varaible because
+      * they are coming in chunkwise.
+      */
+    for (let [text_key, value] of Object.entries(payload.chunk.text_lookup)) {
+        if (!(text_key in results.tmp_match_counts)) {
+          results.tmp_match_counts[text_key] = {match_count: 0};
+        }
+        results.tmp_match_counts[text_key].match_count += payload.chunk.text_lookup[text_key].match_count;
+    }
     results.data.cpos_ranges = payload.chunk.cpos_ranges;
     let queryFormElement = document.querySelector('#query-form');
     results.data.getQueryStr(queryFormElement);
@@ -51,6 +62,10 @@ function saveQueryData() {
     console.info('Query data chunk saved', results.data);
     if (client.requestQueryProgress === 100) {
       client.isBusy = false;
+      // Update text_lookup with tmp_match_counts.
+      for (let [text_key, value] of Object.entries(results.tmp_match_counts)) {
+        results.data.text_lookup[text_key].match_count = results.tmp_match_counts[text_key].match_count;
+      }
       client.notifyView('query-data-recieved');
     }
   } else {

web/app/static/js/modules/corpus_analysis/model/Results.js

@@ -22,6 +22,8 @@ class Results {
     this.fullResultsData.init();
     this.subResultsData.init();
     this.inspectResultsData.init();
+    // Temporarly save match counts per text
+    this.tmp_match_counts = {};
   }
 
 }

web/config.py

@@ -19,9 +19,10 @@ DEFAULT_SMTP_USE_SSL = 'False'
 DEFAULT_SMTP_USE_TLS = 'False'
 DEFAULT_NUM_PROXIES = '0'
 DEFAULT_PROTOCOL = 'http'
-DEFAULT_RESSOURCES_PER_PAGE = '5'
-DEFAULT_USERS_PER_PAGE = '10'
+DEFAULT_REMEMBER_COOKIE_HTTPONLY = 'True'
+DEFAULT_REMEMBER_COOKIE_SECURE = 'False'
 DEFAULT_SECRET_KEY = 'hard to guess string'
+DEFAULT_SESSION_COOKIE_SECURE = 'False'
 
 
 class Config:
@@ -55,15 +56,19 @@ class Config:
     NUM_PROXIES = int(os.environ.get('NOPAQUE_NUM_PROXIES',
                                      DEFAULT_NUM_PROXIES))
     PROTOCOL = os.environ.get('NOPAQUE_PROTOCOL', DEFAULT_PROTOCOL)
-    RESSOURCES_PER_PAGE = int(os.environ.get('NOPAQUE_RESSOURCES_PER_PAGE',
-                                             DEFAULT_RESSOURCES_PER_PAGE))
-    SECRET_KEY = os.environ.get('NOPAQUE_SECRET_KEY', DEFAULT_SECRET_KEY)
-    USERS_PER_PAGE = int(os.environ.get('NOPAQUE_USERS_PER_PAGE',
-                                        DEFAULT_USERS_PER_PAGE))
-    if PROTOCOL == 'https':
-        REMEMBER_COOKIE_HTTPONLY = True
-        REMEMBER_COOKIE_SECURE = True
-        SESSION_COOKIE_SECURE = True
+    REMEMBER_COOKIE_HTTPONLY = os.environ.get(
+        'NOPAQUE_REMEMBER_COOKIE_HTTPONLY',
+        DEFAULT_REMEMBER_COOKIE_HTTPONLY
+    ).lower() == 'true'
+    REMEMBER_COOKIE_SECURE = os.environ.get(
+        'NOPAQUE_REMEMBER_COOKIE_SECURE',
+        DEFAULT_REMEMBER_COOKIE_SECURE
+    ).lower() == 'true'
+    SECRET_KEY = os.environ.get('RECIPY_SECRET_KEY', DEFAULT_SECRET_KEY)
+    SESSION_COOKIE_SECURE = os.environ.get(
+        'NOPAQUE_SESSION_COOKIE_SECURE',
+        DEFAULT_SESSION_COOKIE_SECURE
+    ).lower() == 'true'
 
     ''' ### Logging ### '''
     LOG_DATE_FORMAT = os.environ.get('NOPAQUE_LOG_DATE_FORMAT',