From 1a98b8203dbb8548598119bb633a093b7e900380 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Mon, 23 Feb 2026 13:10:42 -0500
Subject: [PATCH 01/16] match annotations to sources for filtering

---
 previewers/betatest/js/refiqdacore.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 8d40f2a..45c56f0 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -298,12 +298,12 @@ function parseData2(data) {
                 guid = pdfSel.getAttribute("guid");
                 codes = getCodeNames(pdfSel); // Codes are on the PDF selection
 
+                let sourceGuid = source.getAttribute("guid");
+                
                 selectionMatches = sourceMatches +
                   pdfSel.getAttribute("creatingUser") + pdfSel.getAttribute("modifyingUser") +
                   textSel.getAttribute("creatingUser") + textSel.getAttribute("modifyingUser") +
-                  getCodeRelatedGUIDs(pdfSel);
-
-                let sourceGuid = source.getAttribute("guid");
+                  getCodeRelatedGUIDs(pdfSel) + sourceGuid;
 
                 displayName = createMergedSelectionWithTooltip(selectionName, pdfSel, textSel, sourceGuid);
 
@@ -312,9 +312,10 @@ function parseData2(data) {
                 let selectionName = selection.getAttribute("name");
                 guid = selection.getAttribute("guid");
                 codes = getCodeNames(selection);
-                selectionMatches = sourceMatches + selection.getAttribute("creatingUser") + selection.getAttribute("modifyingUser") + getCodeRelatedGUIDs(selection);
-
                 let sourceGuid = source.getAttribute("guid");
+                
+                selectionMatches = sourceMatches + selection.getAttribute("creatingUser") + selection.getAttribute("modifyingUser") + getCodeRelatedGUIDs(selection) + sourceGuid;
+
                 displayName = selectionName; // Default display name
 
                 if (selection.nodeName === "PDFSelection") {

From 4d063cbdef1e0caf1e5331e251f5decefdfeb9a0 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Mon, 23 Feb 2026 13:37:50 -0500
Subject: [PATCH 02/16] fix label spacing

---
 previewers/betatest/css/refiqdas.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/previewers/betatest/css/refiqdas.css b/previewers/betatest/css/refiqdas.css
index caeea1e..8170c27 100644
--- a/previewers/betatest/css/refiqdas.css
+++ b/previewers/betatest/css/refiqdas.css
@@ -63,4 +63,8 @@
 
 .tooltip-text {
   margin-top: 5px;
+}
+
+.label {
+  margin-left:5px;
 }
\ No newline at end of file

From 4d6c85d7c99a4d42663dc9653f4b52dd4d1fd548 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Mon, 23 Feb 2026 17:11:44 -0500
Subject: [PATCH 03/16] handle no creating user on notes

---
 previewers/betatest/js/refiqdacore.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 45c56f0..7af9008 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -447,14 +447,21 @@ function parseData2(data) {
         desc = desc[0].childNodes[0];
       }
       let matches = '';
-      if (note.getAttribute("creatingUser")) {
-        matches = matches + note.getAttribute("creatingUser");
+      let name = '';
+      let user = note.getAttribute("creatingUser");
+      if (user) {
+        matches = matches + user;
+        name = userMap.get(user).getAttribute("name");
       }
-      if (note.getAttribute("modifyingUser")) {
-        matches = matches + note.getAttribute("modifyingUser");
+      user = note.getAttribute("modifyingUser"); 
+      if (user) {
+        matches = matches + user;
+        if(name === '') {
+          name = userMap.get(user).getAttribute("name");
+        }
       }
 
-      let tr = addRow(noteTable, note.getAttribute("name"), ptc, desc, userMap.get(note.getAttribute("creatingUser")).getAttribute("name"));
+      let tr = addRow(noteTable, note.getAttribute("name"), ptc, desc, name);
       tr.attr('data-guid', note.getAttribute("guid"));
       tr.attr('data-matches', matches);
 

From ff15e2799dcd3e202ca7f3b51b6ecf875259b975 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Tue, 24 Feb 2026 10:10:38 -0500
Subject: [PATCH 04/16] multiple names in notes, new case vs var table, ; sep
 for set codes

---
 previewers/betatest/js/refiqdacore.js | 84 +++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 10 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 7af9008..da0f804 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -448,18 +448,26 @@ function parseData2(data) {
       }
       let matches = '';
       let name = '';
-      let user = note.getAttribute("creatingUser");
-      if (user) {
-        matches = matches + user;
-        name = userMap.get(user).getAttribute("name");
+      let creatingUserGuid = note.getAttribute("creatingUser");
+      let modifyingUserGuid = note.getAttribute("modifyingUser");
+      let userNames = new Set();
+
+      if (creatingUserGuid) {
+        matches += creatingUserGuid;
+        let user = userMap.get(creatingUserGuid);
+        if (user) {
+          userNames.add(user.getAttribute("name"));
+        }
       }
-      user = note.getAttribute("modifyingUser"); 
-      if (user) {
-        matches = matches + user;
-        if(name === '') {
-          name = userMap.get(user).getAttribute("name");
+
+      if (modifyingUserGuid) {
+        matches += modifyingUserGuid;
+        let user = userMap.get(modifyingUserGuid);
+        if (user) {
+          userNames.add(user.getAttribute("name"));
         }
       }
+      name = Array.from(userNames).join(', ');
 
       let tr = addRow(noteTable, note.getAttribute("name"), ptc, desc, name);
       tr.attr('data-guid', note.getAttribute("guid"));
@@ -476,6 +484,62 @@ function parseData2(data) {
     tables.push(noteDataTable);
   }
 
+ let variables = xmlDoc.getElementsByTagName("Variable");
+  let cases = xmlDoc.getElementsByTagName("Case");
+
+  if (variables.length > 0 && cases.length > 0) {
+    let variableMap = new Map();
+    let variableHeaders = ["Source"]; // First column is the source document
+
+    for (let variable of variables) {
+      let guid = variable.getAttribute("guid");
+      let name = variable.getAttribute("name");
+      // Store the variable name and its column index in the table
+      variableMap.set(guid, { name: name, index: variableHeaders.length });
+      variableHeaders.push(name);
+    }
+
+    let caseBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
+    caseBlock.append($("<h2/>").html("Cases"));
+    let caseTable = createTable("Cases", ...variableHeaders).appendTo(caseBlock);
+    caseTable.addClass("casetable compact stripe");
+
+    for (let caseNode of cases) {
+      let rowData = new Array(variableHeaders.length).fill(""); // Initialize row with empty strings
+
+      // Find the source document for the case
+      let sourceRef = caseNode.getElementsByTagName("SourceRef")[0];
+      if (sourceRef) {
+        let sourceGuid = sourceRef.getAttribute("targetGUID");
+        let source = sourceMap.get(sourceGuid);
+        if (source) {
+          rowData[0] = createSourceReference(source, zipUrl);
+        }
+      }
+
+      // Populate variable values for the case
+      let variableValues = caseNode.getElementsByTagName("VariableValue");
+      for (let varValue of variableValues) {
+        let varRef = varValue.getElementsByTagName("VariableRef")[0];
+        let textValue = varValue.getElementsByTagName("TextValue")[0];
+        if (varRef && textValue) {
+          let varGuid = varRef.getAttribute("targetGUID");
+          let variableInfo = variableMap.get(varGuid);
+          if (variableInfo) {
+            rowData[variableInfo.index] = textValue.textContent;
+          }
+        }
+      }
+      addRow(caseTable, ...rowData);
+    }
+
+    // Initialize DataTable for cases, but don't add to filterable tables
+    new DataTable(".casetable", {
+      select: false // This table should not be selectable
+    });
+  }
+
+ 
   let sets = xmlDoc.getElementsByTagName("Set");
   if (sets != null && sets.length > 0) {
     $('#filterby').append($('<option/>').prop('value', 'Sets').text('Sets'));
@@ -495,7 +559,7 @@ function parseData2(data) {
           let codeId = member.getAttribute('targetGUID');
           let code = codeMap.get(codeId);
           if (code != null) {
-            codeNames = codeNames + ' ' + code.getAttribute("name");
+            codeNames = codeNames + '; ' + code.getAttribute("name");
           }
           matches += codeId;
         }

From 2b70b745ae84838f41a5aa8dff97f5de28d075ec Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Tue, 24 Feb 2026 10:29:01 -0500
Subject: [PATCH 05/16] typo

---
 previewers/betatest/css/refiqdas.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/previewers/betatest/css/refiqdas.css b/previewers/betatest/css/refiqdas.css
index 8170c27..8a844ad 100644
--- a/previewers/betatest/css/refiqdas.css
+++ b/previewers/betatest/css/refiqdas.css
@@ -65,6 +65,6 @@
   margin-top: 5px;
 }
 
-.label {
+label {
   margin-left:5px;
 }
\ No newline at end of file

From d2ceff82a92204378d25bf2a235072c2e5108eb5 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Tue, 24 Feb 2026 10:30:07 -0500
Subject: [PATCH 06/16] hover msg when no selection text

---
 previewers/betatest/js/refiqdacore.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index da0f804..88b2233 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -295,6 +295,9 @@ function parseData2(data) {
                 let pdfSel = selection.pdfSelection;
                 let textSel = selection.plainTextSelection;
                 let selectionName = pdfSel.getAttribute("name");
+                if(!selectionName) {
+                  selectionName = "(Hover for more info)";
+                }
                 guid = pdfSel.getAttribute("guid");
                 codes = getCodeNames(pdfSel); // Codes are on the PDF selection
 
@@ -310,6 +313,9 @@ function parseData2(data) {
               } else {
                 // Handle regular selection node
                 let selectionName = selection.getAttribute("name");
+                if(!selectionName) {
+                  selectionName = "(Hover for more info)";
+                }
                 guid = selection.getAttribute("guid");
                 codes = getCodeNames(selection);
                 let sourceGuid = source.getAttribute("guid");

From e44d8aec504370dfffbb068783e18e51d7296c70 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 27 Feb 2026 10:37:21 -0500
Subject: [PATCH 07/16] initial redacted code

---
 previewers/betatest/css/refiqdas.css  | 10 +++++++++
 previewers/betatest/js/refiqda.js     | 29 ++++++++++++++++-----------
 previewers/betatest/js/refiqdacore.js |  6 +++++-
 previewers/betatest/js/refiqdpx.js    |  5 +++++
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/previewers/betatest/css/refiqdas.css b/previewers/betatest/css/refiqdas.css
index 8a844ad..a399ca2 100644
--- a/previewers/betatest/css/refiqdas.css
+++ b/previewers/betatest/css/refiqdas.css
@@ -67,4 +67,14 @@
 
 label {
   margin-left:5px;
+}
+.redacted-notice {
+  background-color: #fffbe6; /* A light yellow background */
+  border: 1px solid #ffe58f; /* A slightly darker yellow border */
+  border-radius: 4px;        /* Softens the corners */
+  padding: 15px;             /* Adds space inside the box */
+  margin-bottom: 20px;       /* Adds space below the notice */
+  color: #8a6d3b;            /* A dark, brownish-yellow text color for good contrast */
+  text-align: center;        /* Centers the notice text */
+  font-weight: bold;         /* Makes the text bold */
 }
\ No newline at end of file
diff --git a/previewers/betatest/js/refiqda.js b/previewers/betatest/js/refiqda.js
index 957d866..c11ec16 100644
--- a/previewers/betatest/js/refiqda.js
+++ b/previewers/betatest/js/refiqda.js
@@ -1,15 +1,20 @@
 function writeContent(fileUrl, file, title, authors) {
-    addStandardPreviewHeader(file, title, authors);
-    options = {
-        "stripIgnoreTag": true,
-        "stripIgnoreTagBody": ['script', 'head']
-    };  // Custom rules
-    wait = $('<div/>').attr('id', 'waiting');
-    $('<img/>').width('15%').attr('src','images/Loading_icon.gif').attr('id','throbber').appendTo(wait);
-    $('<span/>').text('Retrieving File...').appendTo(wait);
-    wait.appendTo($('.preview'));
+  addStandardPreviewHeader(file, title, authors);
+  options = {
+    "stripIgnoreTag": true,
+    "stripIgnoreTagBody": ['script', 'head']
+  };  // Custom rules
+  wait = $('<div/>').attr('id', 'waiting');
+  $('<img/>').width('15%').attr('src', 'images/Loading_icon.gif').attr('id', 'throbber').appendTo(wait);
+  $('<span/>').text('Retrieving File...').appendTo(wait);
+  wait.appendTo($('.preview'));
 
-        fetch(fileUrl)
-  .then(response => response.text())
-  .then(data => parseData(data));
+  if (fileUrl.includes('auxiliary/qdpx')) {
+    redactedMode = true;
+  } else {
+    redactedMode = false;
+  }
+  fetch(fileUrl)
+    .then(response => response.text())
+    .then(data => parseData(data));
 }
diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 88b2233..3a18c88 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -68,6 +68,8 @@ function isZipMode() {
     return typeof zipUrl !== 'undefined' && zipUrl !== null && zipUrl !== '';
 }
 
+var redactedMode;
+
 var wait;
 var cy;
 
@@ -101,7 +103,9 @@ function parseData2(data) {
   parser = new DOMParser();
   xmlDoc = parser.parseFromString(data, "text/xml");
 
-
+  if(redactedMode) {
+    let redactedNotice = $('<h2/>').addClass('redacted-notice').text("Note: This is a redacted, public view of the restricted QDAS file").appendTo($(".preview"));
+  }
     //Add a Filter By option
   let filterBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
   filterBlock.append($("<h2/>").html("Enable Filtering By"));
diff --git a/previewers/betatest/js/refiqdpx.js b/previewers/betatest/js/refiqdpx.js
index ad73e83..3d692d3 100644
--- a/previewers/betatest/js/refiqdpx.js
+++ b/previewers/betatest/js/refiqdpx.js
@@ -4,6 +4,11 @@ function writeContent(fileUrl, file, title, authors) {
     // Set the global zipUrl variable so other code knows we're in zip mode
     zipUrl = fileUrl;
     
+    if(fileUrl.includes('auxiliary/qdpx')) {
+      redactedMode = true;
+    } else {
+      redactedMode = false;
+    }
     readZip(fileUrl);
 }
 

From 27c8278cc503b11334ef254118ec7ae028619063 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 27 Feb 2026 10:37:21 -0500
Subject: [PATCH 08/16] initial redacted code

---
 previewers/betatest/css/refiqdas.css  | 13 ++++++++++++
 previewers/betatest/js/refiqda.js     | 29 ++++++++++++++++-----------
 previewers/betatest/js/refiqdacore.js |  6 +++++-
 previewers/betatest/js/refiqdpx.js    |  5 +++++
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/previewers/betatest/css/refiqdas.css b/previewers/betatest/css/refiqdas.css
index caeea1e..07c9fe0 100644
--- a/previewers/betatest/css/refiqdas.css
+++ b/previewers/betatest/css/refiqdas.css
@@ -63,4 +63,17 @@
 
 .tooltip-text {
   margin-top: 5px;
+}
+label {
+  margin-left:5px;
+}
+.redacted-notice {
+  background-color: #fffbe6; /* A light yellow background */
+  border: 1px solid #ffe58f; /* A slightly darker yellow border */
+  border-radius: 4px;        /* Softens the corners */
+  padding: 15px;             /* Adds space inside the box */
+  margin-bottom: 20px;       /* Adds space below the notice */
+  color: #8a6d3b;            /* A dark, brownish-yellow text color for good contrast */
+  text-align: center;        /* Centers the notice text */
+  font-weight: bold;         /* Makes the text bold */
 }
\ No newline at end of file
diff --git a/previewers/betatest/js/refiqda.js b/previewers/betatest/js/refiqda.js
index 957d866..c11ec16 100644
--- a/previewers/betatest/js/refiqda.js
+++ b/previewers/betatest/js/refiqda.js
@@ -1,15 +1,20 @@
 function writeContent(fileUrl, file, title, authors) {
-    addStandardPreviewHeader(file, title, authors);
-    options = {
-        "stripIgnoreTag": true,
-        "stripIgnoreTagBody": ['script', 'head']
-    };  // Custom rules
-    wait = $('<div/>').attr('id', 'waiting');
-    $('<img/>').width('15%').attr('src','images/Loading_icon.gif').attr('id','throbber').appendTo(wait);
-    $('<span/>').text('Retrieving File...').appendTo(wait);
-    wait.appendTo($('.preview'));
+  addStandardPreviewHeader(file, title, authors);
+  options = {
+    "stripIgnoreTag": true,
+    "stripIgnoreTagBody": ['script', 'head']
+  };  // Custom rules
+  wait = $('<div/>').attr('id', 'waiting');
+  $('<img/>').width('15%').attr('src', 'images/Loading_icon.gif').attr('id', 'throbber').appendTo(wait);
+  $('<span/>').text('Retrieving File...').appendTo(wait);
+  wait.appendTo($('.preview'));
 
-        fetch(fileUrl)
-  .then(response => response.text())
-  .then(data => parseData(data));
+  if (fileUrl.includes('auxiliary/qdpx')) {
+    redactedMode = true;
+  } else {
+    redactedMode = false;
+  }
+  fetch(fileUrl)
+    .then(response => response.text())
+    .then(data => parseData(data));
 }
diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 8d40f2a..1f097f1 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -68,6 +68,8 @@ function isZipMode() {
     return typeof zipUrl !== 'undefined' && zipUrl !== null && zipUrl !== '';
 }
 
+var redactedMode;
+
 var wait;
 var cy;
 
@@ -101,7 +103,9 @@ function parseData2(data) {
   parser = new DOMParser();
   xmlDoc = parser.parseFromString(data, "text/xml");
 
-
+  if(redactedMode) {
+    let redactedNotice = $('<h2/>').addClass('redacted-notice').text("Note: This is a redacted, public view of the restricted QDAS file").appendTo($(".preview"));
+  }
     //Add a Filter By option
   let filterBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
   filterBlock.append($("<h2/>").html("Enable Filtering By"));
diff --git a/previewers/betatest/js/refiqdpx.js b/previewers/betatest/js/refiqdpx.js
index ad73e83..3d692d3 100644
--- a/previewers/betatest/js/refiqdpx.js
+++ b/previewers/betatest/js/refiqdpx.js
@@ -4,6 +4,11 @@ function writeContent(fileUrl, file, title, authors) {
     // Set the global zipUrl variable so other code knows we're in zip mode
     zipUrl = fileUrl;
     
+    if(fileUrl.includes('auxiliary/qdpx')) {
+      redactedMode = true;
+    } else {
+      redactedMode = false;
+    }
     readZip(fileUrl);
 }
 

From c9d2caadb62d20b22024f0edbca186e7b69883f5 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 27 Feb 2026 12:24:50 -0500
Subject: [PATCH 09/16] redact button start, updates from QDAS branch

---
 previewers/betatest/js/refiqdacore.js | 164 ++++++++++++++++++++++++--
 1 file changed, 152 insertions(+), 12 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 1f097f1..b7cfc9f 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -299,26 +299,34 @@ function parseData2(data) {
                 let pdfSel = selection.pdfSelection;
                 let textSel = selection.plainTextSelection;
                 let selectionName = pdfSel.getAttribute("name");
+                
+                if(!selectionName) {
+                   selectionName = "(Hover for more info)";
+                }
                 guid = pdfSel.getAttribute("guid");
                 codes = getCodeNames(pdfSel); // Codes are on the PDF selection
 
+                let sourceGuid = source.getAttribute("guid");
+                
                 selectionMatches = sourceMatches +
                   pdfSel.getAttribute("creatingUser") + pdfSel.getAttribute("modifyingUser") +
                   textSel.getAttribute("creatingUser") + textSel.getAttribute("modifyingUser") +
-                  getCodeRelatedGUIDs(pdfSel);
-
-                let sourceGuid = source.getAttribute("guid");
+                  getCodeRelatedGUIDs(pdfSel) + sourceGuid;
 
                 displayName = createMergedSelectionWithTooltip(selectionName, pdfSel, textSel, sourceGuid);
 
               } else {
                 // Handle regular selection node
                 let selectionName = selection.getAttribute("name");
+                if(!selectionName) {
+                  selectionName = "(Hover for more info)";
+                }
                 guid = selection.getAttribute("guid");
                 codes = getCodeNames(selection);
-                selectionMatches = sourceMatches + selection.getAttribute("creatingUser") + selection.getAttribute("modifyingUser") + getCodeRelatedGUIDs(selection);
-
                 let sourceGuid = source.getAttribute("guid");
+                selectionMatches = sourceMatches + selection.getAttribute("creatingUser") + selection.getAttribute("modifyingUser") + getCodeRelatedGUIDs(selection) + sourceGuid;
+
+                
                 displayName = selectionName; // Default display name
 
                 if (selection.nodeName === "PDFSelection") {
@@ -413,7 +421,19 @@ function parseData2(data) {
         });
 
         sourceDataTable = new DataTable(".sourcetable", {
-          select: $('#filterby').val() == 'Sources'
+          select: $('#filterby').val() == 'Sources',
+          order: [[0, 'asc']],
+          columnDefs: [
+            {
+              render: function(data, type, row) {
+                if (type === 'display' && data !== null && data.length > 50) {
+                  return '<span title="' + data + '">' + data.substr(0, 50) + '...</span>';
+                }
+                return data;
+              },
+              targets: 1
+            }
+          ]
         });
 
         if (typeof downloadFile === 'function') {
@@ -425,6 +445,8 @@ function parseData2(data) {
         }
 
         tables.push(sourceDataTable);
+        addSelectAllAndUnselectButtons(sourceDataTable, sourceBlock, 'sourcetable');
+        addRedactionButton(sourceDataTable, sourceBlock);
       }
 
     }
@@ -450,14 +472,29 @@ function parseData2(data) {
         desc = desc[0].childNodes[0];
       }
       let matches = '';
-      if (note.getAttribute("creatingUser")) {
-        matches = matches + note.getAttribute("creatingUser");
+      let name = '';
+      let creatingUserGuid = note.getAttribute("creatingUser");
+      let modifyingUserGuid = note.getAttribute("modifyingUser");
+      let userNames = new Set();
+
+      if (creatingUserGuid) {
+        matches += creatingUserGuid;
+        let user = userMap.get(creatingUserGuid);
+        if (user) {
+          userNames.add(user.getAttribute("name"));
+        }
+      }
+
+      if (modifyingUserGuid) {
+        matches += modifyingUserGuid;
+        let user = userMap.get(modifyingUserGuid);
+        if (user) {
+          userNames.add(user.getAttribute("name"));
       }
-      if (note.getAttribute("modifyingUser")) {
-        matches = matches + note.getAttribute("modifyingUser");
       }
+      name = Array.from(userNames).join(', ');
 
-      let tr = addRow(noteTable, note.getAttribute("name"), ptc, desc, userMap.get(note.getAttribute("creatingUser")).getAttribute("name"));
+      let tr = addRow(noteTable, note.getAttribute("name"), ptc, desc, name);
       tr.attr('data-guid', note.getAttribute("guid"));
       tr.attr('data-matches', matches);
 
@@ -472,6 +509,62 @@ function parseData2(data) {
     tables.push(noteDataTable);
   }
 
+ let variables = xmlDoc.getElementsByTagName("Variable");
+  let cases = xmlDoc.getElementsByTagName("Case");
+
+  if (variables.length > 0 && cases.length > 0) {
+    let variableMap = new Map();
+    let variableHeaders = ["Source"]; // First column is the source document
+
+    for (let variable of variables) {
+      let guid = variable.getAttribute("guid");
+      let name = variable.getAttribute("name");
+      // Store the variable name and its column index in the table
+      variableMap.set(guid, { name: name, index: variableHeaders.length });
+      variableHeaders.push(name);
+    }
+
+    let caseBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
+    caseBlock.append($("<h2/>").html("Cases"));
+    let caseTable = createTable("Cases", ...variableHeaders).appendTo(caseBlock);
+    caseTable.addClass("casetable compact stripe");
+
+    for (let caseNode of cases) {
+      let rowData = new Array(variableHeaders.length).fill(""); // Initialize row with empty strings
+
+      // Find the source document for the case
+      let sourceRef = caseNode.getElementsByTagName("SourceRef")[0];
+      if (sourceRef) {
+        let sourceGuid = sourceRef.getAttribute("targetGUID");
+        let source = sourceMap.get(sourceGuid);
+        if (source) {
+          rowData[0] = createSourceReference(source, zipUrl);
+        }
+      }
+
+      // Populate variable values for the case
+      let variableValues = caseNode.getElementsByTagName("VariableValue");
+      for (let varValue of variableValues) {
+        let varRef = varValue.getElementsByTagName("VariableRef")[0];
+        let textValue = varValue.getElementsByTagName("TextValue")[0];
+        if (varRef && textValue) {
+          let varGuid = varRef.getAttribute("targetGUID");
+          let variableInfo = variableMap.get(varGuid);
+          if (variableInfo) {
+            rowData[variableInfo.index] = textValue.textContent;
+          }
+        }
+      }
+      addRow(caseTable, ...rowData);
+    }
+
+    // Initialize DataTable for cases, but don't add to filterable tables
+    new DataTable(".casetable", {
+      select: false // This table should not be selectable
+    });
+  }
+
+ 
   let sets = xmlDoc.getElementsByTagName("Set");
   if (sets != null && sets.length > 0) {
     $('#filterby').append($('<option/>').prop('value', 'Sets').text('Sets'));
@@ -491,7 +584,7 @@ function parseData2(data) {
           let codeId = member.getAttribute('targetGUID');
           let code = codeMap.get(codeId);
           if (code != null) {
-            codeNames = codeNames + ' ' + code.getAttribute("name");
+            codeNames = codeNames + '; ' + code.getAttribute("name");
           }
           matches += codeId;
         }
@@ -687,6 +780,7 @@ $("#filterby")
       if (sourceDataTable) {
         sourceDataTable.destroy();
         $(".sourcetable").off('select.dt deselect.dt');
+        $('.redact-btn').remove();
       }
       if ($(".sourcetable").length) {
         sourceDataTable = new DataTable(".sourcetable", {
@@ -694,6 +788,9 @@ $("#filterby")
         });
         attachFilterHandler(sourceDataTable);
         sourceDataTable.draw();
+        if ($('#filterby').val() == 'Sources') {
+            addRedactionButton(sourceDataTable, $('#sources'));
+        }
         tables.push(sourceDataTable);
       }
 
@@ -1135,3 +1232,46 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
         return null;
     }
 }
+
+function addRedactionButton(dataTable, tableContainer) {
+  const redactButton = $('<button>Create Redacted Project from Selection</button>')
+    .addClass('redact-btn')
+    .hide()
+    .on('click', function() {
+      const selectedRows = dataTable.rows({ selected: true }).data();
+      const guidsToRedact = [];
+      for (let i = 0; i < selectedRows.length; i++) {
+        // Assuming the GUID is stored in a data attribute of the row
+        const rowNode = dataTable.row(selectedRows.nodes()[i]).node();
+        const guid = $(rowNode).data('guid');
+        if (guid) {
+          guidsToRedact.push(guid);
+        }
+      }
+      if (guidsToRedact.length > 0) {
+        redactSources(guidsToRedact);
+      } else {
+        alert("No sources selected for redaction.");
+      }
+    });
+  tableContainer.find('h2').first().append(redactButton);
+
+  dataTable.on('select deselect', function() {
+    const selectedRows = dataTable.rows({ selected: true }).count();
+    if (selectedRows > 0) {
+      redactButton.show();
+    } else {
+      redactButton.hide();
+    }
+  });
+}
+
+function redactSources(guidsToRedact) {
+  console.log("Redacting sources with GUIDs:", guidsToRedact);
+  alert("Redaction functionality is not yet implemented.\nSelected source GUIDs: " + guidsToRedact.join(', '));
+  // In the next steps, we will implement the logic here to:
+  // 1. Modify the XML codebook to remove selected sources and their annotations.
+  // 2. If it's a zip file, remove the source files from the archive.
+  // 3. POST the new redacted file to Dataverse.
+}
+

From 11ff860758b30b5f897fdda4d6e06217a086a874 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 27 Feb 2026 12:33:07 -0500
Subject: [PATCH 10/16] merge fix

---
 previewers/betatest/js/refiqdacore.js | 918 --------------------------
 1 file changed, 918 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 1426fd7..5917d0c 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -299,7 +299,6 @@ function parseData2(data) {
                 let pdfSel = selection.pdfSelection;
                 let textSel = selection.plainTextSelection;
                 let selectionName = pdfSel.getAttribute("name");
-<<<<<<< HEAD
                 
                 if(!selectionName) {
                    selectionName = "(Hover for more info)";
@@ -1275,920 +1274,3 @@ function redactSources(guidsToRedact) {
   // 2. If it's a zip file, remove the source files from the archive.
   // 3. POST the new redacted file to Dataverse.
 }
-
-=======
-                if(!selectionName) {
-                  selectionName = "(Hover for more info)";
-                }
-                guid = pdfSel.getAttribute("guid");
-                codes = getCodeNames(pdfSel); // Codes are on the PDF selection
-
-                let sourceGuid = source.getAttribute("guid");
-                
-                selectionMatches = sourceMatches +
-                  pdfSel.getAttribute("creatingUser") + pdfSel.getAttribute("modifyingUser") +
-                  textSel.getAttribute("creatingUser") + textSel.getAttribute("modifyingUser") +
-                  getCodeRelatedGUIDs(pdfSel) + sourceGuid;
-
-                displayName = createMergedSelectionWithTooltip(selectionName, pdfSel, textSel, sourceGuid);
-
-              } else {
-                // Handle regular selection node
-                let selectionName = selection.getAttribute("name");
-                if(!selectionName) {
-                  selectionName = "(Hover for more info)";
-                }
-                guid = selection.getAttribute("guid");
-                codes = getCodeNames(selection);
-                let sourceGuid = source.getAttribute("guid");
-                
-                selectionMatches = sourceMatches + selection.getAttribute("creatingUser") + selection.getAttribute("modifyingUser") + getCodeRelatedGUIDs(selection) + sourceGuid;
-
-                displayName = selectionName; // Default display name
-
-                if (selection.nodeName === "PDFSelection") {
-                  let page = selection.getAttribute("page");
-                  let firstX = selection.getAttribute("firstX");
-                  let firstY = selection.getAttribute("firstY");
-                  let secondX = selection.getAttribute("secondX");
-                  let secondY = selection.getAttribute("secondY");
-                  displayName = createPdfSelectionWithTooltip(selectionName, page, firstX, firstY, secondX, secondY, sourceGuid);
-                } else if (selection.nodeName === "PlainTextSelection") {
-                  let startPos = selection.getAttribute("startPosition");
-                  let endPos = selection.getAttribute("endPosition");
-                  let plainTextPath = source.getAttribute("plainTextPath");
-                  if (startPos && endPos && plainTextPath) {
-                    displayName = createSelectionWithTooltip(selectionName, startPos, endPos, plainTextPath, sourceGuid);
-                  }
-                }
-              }
-
-              annotationRows.push({
-                sourceRef: createSourceReference(source, zipUrl),
-                type: source.nodeName,
-                name: displayName,
-                codes: codes,
-                guid: guid,
-                matches: selectionMatches
-              });
-            });
-          }
-
-          // Add whole document entry to sources
-          sourceRows.push({
-            sourceRef: createSourceReference(source, zipUrl),
-            type: source.nodeName,
-            name: "Whole Document",
-            codes: "",
-            guid: source.getAttribute("guid"),
-            matches: sourceMatches
-          });
-        }
-      }
-
-
-      // Create Annotations table if there are any annotations
-      if (annotationRows.length > 0) {
-          $('#filterby').append($('<option/>').prop('value', 'Annotations').text('Annotations'));
-
-          let annotationBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-          annotationBlock.append($("<h2/>").html("Annotations"));
-          let annotationTable = createTable("Annotations", "Filename", "Type", "Selection", "Codes").appendTo(annotationBlock);
-          annotationTable.addClass("annotationtable compact stripe");
-
-          annotationRows.forEach(function(rowData) {
-              let tr = addRow(annotationTable, rowData.sourceRef, rowData.type, rowData.name, rowData.codes);
-              tr.attr('data-guid', rowData.guid);
-              tr.attr('data-matches', rowData.matches);
-          });
-
-          var annotationDataTable = new DataTable(".annotationtable", {
-              select: $('#filterby').val() == 'Annotations'
-          });
-
-          // Initialize tooltips after table is created (ONLY for annotations table)
-          initializeExcerptTooltips();
-
-          if (typeof downloadFile === 'function') {
-              $("a[data-entry-index]").click(downloadFile);
-              $('.annotationtable').on('draw.dt', function() {
-                  $("a[data-entry-index]").off('click');
-                  $("a[data-entry-index]").click(downloadFile);
-                  // Reinitialize tooltips after redraw (ONLY for annotations)
-                  initializeExcerptTooltips();
-              });
-          }
-
-          tables.push(annotationDataTable);
-      }
-
-      // Create Sources table if there are any sources
-      if (sourceRows.length > 0) {
-        $('#filterby').append($('<option/>').prop('value', 'Sources').text('Sources'));
-
-        let sourceBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-        sourceBlock.append($("<h2/>").html("Sources"));
-        let sourceTable = createTable("Sources", "Filename", "Type", "Selection", "Codes").appendTo(sourceBlock);
-        sourceTable.addClass("sourcetable compact stripe");
-
-        sourceRows.forEach(function(rowData) {
-          let tr = addRow(sourceTable, rowData.sourceRef, rowData.type, rowData.name, rowData.codes);
-          tr.attr('data-guid', rowData.guid);
-          tr.attr('data-matches', rowData.matches);
-        });
-
-        sourceDataTable = new DataTable(".sourcetable", {
-          select: $('#filterby').val() == 'Sources'
-        });
-
-        if (typeof downloadFile === 'function') {
-          $("a[data-entry-index]").click(downloadFile);
-          $('.sourcetable').on('draw.dt', function() {
-            $("a[data-entry-index]").off('click');
-            $("a[data-entry-index]").click(downloadFile);
-          });
-        }
-
-        tables.push(sourceDataTable);
-      }
-
-    }
-  }
-
-
-  var notes = xmlDoc.getElementsByTagName("Note");
-
-  if (notes != null && notes.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Notes').text('Notes'));
-    let noteBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    noteBlock.append($("<h2/>").html("Notes"));
-    let noteTable = createTable("Notes", "Name", "Content", "Description", "Authors").appendTo(noteBlock);
-    noteTable.addClass("notetable compact stripe");
-
-    for (let note of notes) {
-      let ptc = note.getElementsByTagName("PlainTextContent");
-      if (ptc[0] != null) {
-        ptc = ptc[0].childNodes[0];
-      }
-      let desc = note.getElementsByTagName("Description");
-      if (desc[0] != null) {
-        desc = desc[0].childNodes[0];
-      }
-      let matches = '';
-      let name = '';
-      let creatingUserGuid = note.getAttribute("creatingUser");
-      let modifyingUserGuid = note.getAttribute("modifyingUser");
-      let userNames = new Set();
-
-      if (creatingUserGuid) {
-        matches += creatingUserGuid;
-        let user = userMap.get(creatingUserGuid);
-        if (user) {
-          userNames.add(user.getAttribute("name"));
-        }
-      }
-
-      if (modifyingUserGuid) {
-        matches += modifyingUserGuid;
-        let user = userMap.get(modifyingUserGuid);
-        if (user) {
-          userNames.add(user.getAttribute("name"));
-        }
-      }
-      name = Array.from(userNames).join(', ');
-
-      let tr = addRow(noteTable, note.getAttribute("name"), ptc, desc, name);
-      tr.attr('data-guid', note.getAttribute("guid"));
-      tr.attr('data-matches', matches);
-
-      noteMap.set(note.getAttribute("guid"), note);
-
-    }
-
-    noteDataTable = new DataTable(".notetable", {
-      select: $('#filterby').val() == 'Notes'
-      //columnDefs:[{target:0,visible:false,seachable:false}]
-    });
-    tables.push(noteDataTable);
-  }
-
- let variables = xmlDoc.getElementsByTagName("Variable");
-  let cases = xmlDoc.getElementsByTagName("Case");
-
-  if (variables.length > 0 && cases.length > 0) {
-    let variableMap = new Map();
-    let variableHeaders = ["Source"]; // First column is the source document
-
-    for (let variable of variables) {
-      let guid = variable.getAttribute("guid");
-      let name = variable.getAttribute("name");
-      // Store the variable name and its column index in the table
-      variableMap.set(guid, { name: name, index: variableHeaders.length });
-      variableHeaders.push(name);
-    }
-
-    let caseBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    caseBlock.append($("<h2/>").html("Cases"));
-    let caseTable = createTable("Cases", ...variableHeaders).appendTo(caseBlock);
-    caseTable.addClass("casetable compact stripe");
-
-    for (let caseNode of cases) {
-      let rowData = new Array(variableHeaders.length).fill(""); // Initialize row with empty strings
-
-      // Find the source document for the case
-      let sourceRef = caseNode.getElementsByTagName("SourceRef")[0];
-      if (sourceRef) {
-        let sourceGuid = sourceRef.getAttribute("targetGUID");
-        let source = sourceMap.get(sourceGuid);
-        if (source) {
-          rowData[0] = createSourceReference(source, zipUrl);
-        }
-      }
-
-      // Populate variable values for the case
-      let variableValues = caseNode.getElementsByTagName("VariableValue");
-      for (let varValue of variableValues) {
-        let varRef = varValue.getElementsByTagName("VariableRef")[0];
-        let textValue = varValue.getElementsByTagName("TextValue")[0];
-        if (varRef && textValue) {
-          let varGuid = varRef.getAttribute("targetGUID");
-          let variableInfo = variableMap.get(varGuid);
-          if (variableInfo) {
-            rowData[variableInfo.index] = textValue.textContent;
-          }
-        }
-      }
-      addRow(caseTable, ...rowData);
-    }
-
-    // Initialize DataTable for cases, but don't add to filterable tables
-    new DataTable(".casetable", {
-      select: false // This table should not be selectable
-    });
-  }
-
- 
-  let sets = xmlDoc.getElementsByTagName("Set");
-  if (sets != null && sets.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Sets').text('Sets'));
-    let setBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    setBlock.append($("<h2/>").html("Sets"));
-    let setTable = createTable("Sets", "Name", "Sources", "Codes").appendTo(setBlock);
-    setTable.addClass("settable compact stripe");
-
-    for (let set of sets) {
-      console.log(set.nodeName + set.parentNode.nodeName + set.parentNode.nodeValue);
-      let codeNames = '';
-      let sourceNames = '';
-      let matches = '';
-
-        let members = set.getElementsByTagName("MemberCode");
-        for (let member of members) {
-          let codeId = member.getAttribute('targetGUID');
-          let code = codeMap.get(codeId);
-          if (code != null) {
-            codeNames = codeNames + '; ' + code.getAttribute("name");
-          }
-          matches += codeId;
-        }
-
-        members = set.getElementsByTagName("MemberSource");
-        for (let member of members) {
-          let sourceId = member.getAttribute('targetGUID');
-          let source = sourceMap.get(sourceId);
-          if (source != null) {
-            sourceNames = sourceNames + ' ' + source.getAttribute("name");
-          }
-          matches += sourceId;
-        }
-
-        let tr = addRow(setTable, set.getAttribute("name"), sourceNames, codeNames);
-        tr.attr('data-matches', matches);
-        tr.attr('data-guid', set.getAttribute('guid'));
-    }
-    setDataTable = new DataTable(".settable", {
-      select: $('#filterby').val() == 'Sets'
-    });
-    tables.push(setDataTable);
-  }
-
-    let graphs = xmlDoc.getElementsByTagName("Graph");
-    if (graphs != null && graphs.length > 0) {
-      let graphBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-      graphBlock.append($("<h2/>").html("Graphs").append($('<span/>').attr('id', 'reset').text('Reset').addClass('btn btn-default')));
-
-      let elements = [];
-      for (let graph of graphs) {
-          let vertexes = graph.getElementsByTagName("Vertex");
-          for (let vertex of vertexes) {
-            var data = {};
-            data.id = vertex.getAttribute("guid");
-            data.name = vertex.getAttribute("name");
-            var gnode = {};
-
-            gnode.data = data;
-            elements.push(gnode);
-          }
-          let edges = graph.getElementsByTagName("Edge");
-          for (let edge of edges) {
-            var data = {};
-            data.id = edge.getAttribute("guid");
-            data.name = "";
-            data.source = edge.getAttribute("sourceVertex");
-            data.target = edge.getAttribute("targetVertex");
-            var gnode = {};
-            gnode.data = data;
-            elements.push(gnode);
-          }
-      }
-      let cyContainer = $('<div/>').width("100%").height("400px").attr('id', 'cy').appendTo(graphBlock);
-      cyContainer.css("background-color", "aliceblue");
-      cy = cytoscape({
-        container: cyContainer, // container to render in
-        elements: elements,
-        style: [ // the stylesheet for the graph
-          {
-            selector: 'node',
-
-            style: {
-              'background-color': '#666',
-              'label': 'data(name)'
-            }
-          },
-
-          {
-            selector: 'edge',
-            style: {
-              'width': 3,
-              'line-color': '#ccc',
-              'target-arrow-color': '#ccc',
-              'target-arrow-shape': 'triangle',
-              'curve-style': 'bezier'
-            }
-          }
-        ],
-
-        layout: {
-          name: 'cose',
-          rows: 1
-        },
-        zoom: 1,
-        pan: { x: 0, y: 0 },
-      });
-      $('#reset').click(function() { cy.fit() });
-  }
-
-$("#filterby")
-  .change(function() {
-    var str = "";
-    $("#filterby option:selected").each(function() {
-      console.log('Changed to ' + $(this).text());
-
-      // Clear selections when changing filter
-      selectedGUIDs = [];
-        tables=new Array();
-
-      // Destroy and recreate userDataTable
-      if (userDataTable) {
-        userDataTable.destroy();
-        //Also remove event handlers
-        $(".usertable").off('select.dt deselect.dt');
-      }
-      if ($(".usertable").length) {
-        userDataTable = new DataTable(".usertable", {
-          select: $('#filterby').val() == 'Users',
-          order: [[0, 'asc']]
-        });
-        attachFilterHandler(userDataTable);
-        userDataTable.draw();
-        tables.push(userDataTable);
-      }
-
-
-      // Destroy and recreate codeDataTable
-      let codeTableOrder;
-      if (codeDataTable) {
-      codeTableOrder = codeDataTable.order();
-        codeDataTable.destroy();
-        $(".codetable").off('select.dt deselect.dt');
-      }
-      if ($(".codetable").length) {
-        // Need to check if color column exists before recreating the table
-        let hasColorColumn = $('.codetable thead th').length === 5; // 5 columns means Color is present plus # of Uses
-        let codeConfig = {
-          select: $('#filterby').val() == 'Codes'
-        };
-        if (hasColorColumn) {
-          codeConfig.columnDefs = [
-            {
-              "render": function(data, type, row) {
-                // Check if data is already HTML (to avoid double-rendering)
-                if (type === 'display' && typeof data === 'string' && !data.includes('<span')) {
-                  return '<span class="colortile" style="display:block;background-color:' + data + '">&nbsp;</span>';
-                }
-                return data;
-              },
-              "targets": 2
-            },
-            {
-              "render": function(data, type, row) {
-                if (type === 'display' && typeof data === 'string' && !data.includes('<input')) {
-                  return '<input class="codable" disabled type="checkbox"' + (data === 'true' ? ' checked' : '') + '/>';
-                }
-                return data;
-              },
-              "width": "20%",
-              "targets": 3
-            },
-            {
-              // Right-align the usage count column
-              className: "dt-right",
-              targets: 4
-            }
-          ];
-        } else {
-          // No color column, so Codable is at index 2
-          codeConfig.columnDefs = [
-            {
-              "render": function(data, type, row) {
-                if (type === 'display' && typeof data === 'string' && !data.includes('<input')) {
-                  return '<input class="codable" disabled type="checkbox"' + (data === 'true' ? ' checked' : '') + '/>';
-                }
-                return data;
-              },
-              "width": "20%",
-              "targets": 2
-            },
-            {
-              // Right-align the usage count column
-              className: "dt-right",
-              targets: 3
-            }
-          ];
-        }
-        // If a previous sort order exists, use it. Otherwise, default to sorting by 'Uses' descending.
-        if (codeTableOrder) {
-            codeConfig.order = codeTableOrder;
-        } else {
-            const usesColumnIndex = hasColorColumn ? 4 : 3;
-            codeConfig.order = [[usesColumnIndex, "desc"]];
-        }
-        codeDataTable = new DataTable(".codetable", codeConfig);
-        attachFilterHandler(codeDataTable);
-        codeDataTable.draw();
-        tables.push(codeDataTable);
-      }
-
-      // Destroy and recreate sourceDataTable
-      if (sourceDataTable) {
-        sourceDataTable.destroy();
-        $(".sourcetable").off('select.dt deselect.dt');
-      }
-      if ($(".sourcetable").length) {
-        sourceDataTable = new DataTable(".sourcetable", {
-          select: $('#filterby').val() == 'Sources'
-        });
-        attachFilterHandler(sourceDataTable);
-        sourceDataTable.draw();
-        tables.push(sourceDataTable);
-      }
-
-      // Destroy and recreate annotationDataTable
-      if (annotationDataTable) {
-        annotationDataTable.destroy();
-        $(".annotationtable").off('select.dt deselect.dt');
-      }
-      if ($(".annotationtable").length) {
-        annotationDataTable = new DataTable(".annotationtable", {
-          select: $('#filterby').val() == 'Annotations'
-        });
-        attachFilterHandler(annotationDataTable);
-        annotationDataTable.draw();
-        tables.push(annotationDataTable);
-      }
-
-      // Destroy and recreate noteDataTable
-      if (noteDataTable) {
-        noteDataTable.destroy();
-        $(".notetable").off('select.dt deselect.dt');
-      }
-      if ($(".notetable").length) {
-        noteDataTable = new DataTable(".notetable", {
-          select: $('#filterby').val() == 'Notes'
-        });
-        attachFilterHandler(noteDataTable);
-        noteDataTable.draw();
-        tables.push(noteDataTable);
-      }
-
-      // Destroy and recreate setDataTable
-      if (setDataTable) {
-        setDataTable.destroy();
-        $(".settable").off('select.dt deselect.dt');
-      }
-      if ($(".settable").length) {
-        setDataTable = new DataTable(".settable", {
-          select: $('#filterby').val() == 'Sets'
-        });
-        attachFilterHandler(setDataTable);
-        setDataTable.draw();
-        tables.push(setDataTable);
-      }
-    });
-  });
-
-
-  $('#waiting').remove();
-}
-
-function createTable() {
-  let table = $("<table/>");
-  table.prop('id', arguments[0]);
-  let tr = $("<tr/>").appendTo($("<thead/>").appendTo(table));
-  for (var i = 1; i < arguments.length; i++) {
-    tr.append($("<th/>").text(arguments[i]));
-  }
-  let tableBody = $("<tbody/>").appendTo(table);
-  return table;
-}
-
-function addRow(table, ...values) {
-  let tr = $('<tr/>');
-  values.forEach(function(value) {
-    let td = $('<td/>');
-    // Check if value is a jQuery object
-    if (value instanceof jQuery) {
-      td.append(value);
-    } else {
-      td.html(value || '');
-    }
-    td.appendTo(tr);
-  });
-  tr.appendTo(table);
-  return tr;
-}
-
-// Helper function to attach the filtering logic
-function attachFilterHandler(dataTable) {
-  //When selections are made, update the array of selected GUIDs and redraw other tables so they get filtered.
-  dataTable.on('select deselect', function(e, dt, type, indexes) {
-    if (type === 'row') {
-      selectedGUIDs = new Array();
-      dataTable.rows({ selected: true }).nodes().to$().each(function(index, element) {
-        selectedGUIDs.push(element.dataset.guid);
-      });
-      // Filter all other tables using the CURRENT `tables` array
-      tables.filter(curTable => curTable !== dataTable).forEach(table => {
-        table.search.fixed('refiqdaFilter', selectedGUIDs.length === 0 ? null : createRefiqdaFilterFunction(table));
-        table.draw();
-      });
-    }
-  });
-}
-
-  // Add a  method that filters results based on whether a GUID exists in the 'Related' hidden column.
-  // The idea is that each table puts the GUIDs of all related items (in other tables) in that column so this method
-  // becomes a generic way to filter by user, code, source, etc.
-  // If there is no filtering or the method is called on the table to filter by, all rows are returned.
-
-function createRefiqdaFilterFunction(dataTable) {
-  return function(searchStr, data, index) {
-    // console.log('Filtering: ' + index);
-
-    if (selectedGUIDs.length === 0) {
-      return true;
-    }
-
-    var rowNode = dataTable.row(index).node();
-    
-    if (!rowNode) {
-      console.log('No row node found for index: ' + index);
-      return true;
-    }
-
-    var curGuid = $(rowNode).attr('data-guid');
-    var matches = $(rowNode).attr('data-matches') || '';
-
-    let found = false;
-    for (let guid of selectedGUIDs) {
-      if (!guid) continue;
-      
-      if (matches.includes(guid)) {
-        found = true;
-        break;
-      }
-      let revMatches = $('[data-guid="' + guid + '"]').attr('data-matches') || '';
-      if (revMatches.includes(curGuid)) {
-        found = true;
-        break;
-      }
-    }
-    // console.log('Result: ' + found);
-    return found;
-  };
-}
-
-function getSelections(source) {
-  let selections = [];
-  // If it's a PDF source, we look for both PDF and PlainText selections to merge them
-  if (source.nodeName === "PDFSource") {
-    const representation = source.querySelector("Representation");
-    const plainTextSelections = new Map();
-
-    // Map PlainTextSelections by their GUID from the Representation, if it exists
-    if (representation) {
-      for (const pts of representation.getElementsByTagName("PlainTextSelection")) {
-        plainTextSelections.set(pts.getAttribute("guid"), pts);
-      }
-    }
-
-    // Process PDFSelections
-    for (const pdfSel of source.getElementsByTagName("PDFSelection")) {
-      const guid = pdfSel.getAttribute("guid");
-      const matchingPlainTextSel = plainTextSelections.get(guid);
-
-      if (matchingPlainTextSel) {
-        // Found a pair, create a merged object
-        selections.push({
-          isMerged: true,
-          pdfSelection: pdfSel,
-          plainTextSelection: matchingPlainTextSel
-        });
-        // Remove from map so we don't process it again
-        plainTextSelections.delete(guid);
-      } else {
-        // It's a PDF-only selection
-        selections.push(pdfSel);
-      }
-    }
-  } else {
-    // For other source types, get direct children ending in "Selection"
-    for (const child of source.children) {
-      if (child.nodeName.endsWith("Selection")) {
-        selections.push(child);
-      }
-    }
-  }
-  return selections;
-}
-
-function getCodeRelatedGUIDs(selection) {
-  let codeGUIDs = '';
-  let codings = selection.getElementsByTagName("Coding");
-  if (codings != null) {
-    for (let coding of codings) {
-      let codeId = coding.getElementsByTagName("CodeRef")[0].getAttribute("targetGUID");
-      let userId = coding.getAttribute('creatingUser');
-      codeGUIDs = codeGUIDs + codeId + userId;
-    }
-  }
-  return codeGUIDs;
-}
-
-function getCodeNames(selection) {
-  let codeNameList = [];
-  let codings = selection.getElementsByTagName("Coding");
-  if (codings != null) {
-    for (let coding of codings) {
-      let codeId = coding.getElementsByTagName("CodeRef")[0].getAttribute("targetGUID");
-      let code = codeMap.get(codeId);
-      if (code != null) {
-        codeNameList.push(code.getAttribute("name"));
-      }
-    }
-  }
-  return codeNameList.join('; ');
-}
-
-// Update the createSelectionWithTooltip function to use a simpler data structure
-function createSelectionWithTooltip(selectionName, startPos, endPos, plainTextPath, sourceGuid) {
-    // Create a span with data attributes that we'll use for the tooltip
-    let spanHtml = '<span class="selection-with-excerpt" ' +
-        'data-start="' + startPos + '" ' +
-        'data-end="' + endPos + '" ' +
-        'data-path="' + plainTextPath + '" ' +
-        'data-source-guid="' + sourceGuid + '">' +
-        selectionName +
-        '</span>';
-    
-    return spanHtml;
-}
-
-function createMergedSelectionWithTooltip(selectionName, pdfSel, plainTextSel, sourceGuid) {
-    // Extract data from both selection types
-    const page = pdfSel.getAttribute("page");
-    const firstX = pdfSel.getAttribute("firstX");
-    const firstY = pdfSel.getAttribute("firstY");
-    const secondX = pdfSel.getAttribute("secondX");
-    const secondY = pdfSel.getAttribute("secondY");
-
-    const startPos = plainTextSel.getAttribute("startPosition");
-    const endPos = plainTextSel.getAttribute("endPosition");
-    const plainTextPath = plainTextSel.closest("Representation").getAttribute("plainTextPath");
-
-    // Create the HTML content for the Tippy tooltip
-    let tooltipContent = `Page: ${page} (X:${firstX}, Y:${firstY}) to (X:${secondX}, Y:${secondY})`;
-
-    // Create a span with data attributes for both PDF and Text functionality
-    let spanHtml = '<span class="selection-with-excerpt selection-with-pdf-coords" ' +
-        'data-tippy-content="' + tooltipContent + '" ' +
-        'data-page="' + page + '" ' +
-        'data-first-x="' + firstX + '" ' +
-        'data-first-y="' + firstY + '" ' +
-        'data-second-x="' + secondX + '" ' +
-        'data-second-y="' + secondY + '" ' +
-        'data-start="' + startPos + '" ' +
-        'data-end="' + endPos + '" ' +
-        'data-path="' + plainTextPath + '" ' +
-        'data-source-guid="' + sourceGuid + '">' +
-        selectionName +
-        '</span>';
-    
-    return spanHtml;
-}
-
-function createPdfSelectionWithTooltip(selectionName, page, firstX, firstY, secondX, secondY, sourceGuid) {
-    // Create the HTML content for the Tippy tooltip
-    let tooltipContent = `Page: ${page}<br>From: (X:${firstX}, Y:${firstY})<br>To: (X:${secondX}, Y:${secondY})`;
-
-    // Create a span with data attributes for functionality and the data-tippy-content attribute for the tooltip
-    let spanHtml = '<span class="selection-with-pdf-coords" ' +
-        'data-tippy-content="' + tooltipContent + '" ' +
-        'data-page="' + page + '" ' +
-        'data-first-x="' + firstX + '" ' +
-        'data-first-y="' + firstY + '" ' +
-        'data-second-x="' + secondX + '" ' +
-        'data-second-y="' + secondY + '" ' +
-        'data-source-guid="' + sourceGuid + '">' +
-        selectionName +
-        '</span>';
-    
-    return spanHtml;
-}
-
-function createSourceReference(source) {
-    let sourceName = source.getAttribute("name");
-    let plainTextPath = source.getAttribute("plainTextPath");
-    
-    if (isZipMode()) {
-        // In zip mode, create a link that uses the zip entry
-        if (typeof entryMap !== 'undefined' && plainTextPath && entryMap[plainTextPath] !== undefined) {
-            let entryIndex = entryMap[plainTextPath];
-            return '<a href="#" data-entry-index="' + entryIndex + '">' + sourceName + '</a>';
-        } else {
-            // No link if file not found in zip
-            return sourceName;
-        }
-    } else {
-        // In non-zip mode, create a direct link to the file if it exists
-        if (plainTextPath) {
-            return '<a href="' + plainTextPath + '" target="_blank">' + sourceName + '</a>';
-        } else {
-            return sourceName;
-        }
-    }
-}
-
-function formatExcerptTooltip(excerpt, startPos, endPos) {
-    //const maxLength = 300; // Increased since we're getting exact excerpts
-    let displayExcerpt = excerpt;
-    
-    // Trim whitespace
-    displayExcerpt = displayExcerpt.trim();
-    
-    //if (displayExcerpt.length > maxLength) {
-    //    displayExcerpt = displayExcerpt.substring(0, maxLength) + '...';
-    //}
-    
-    // Escape HTML to prevent injection, but preserve line breaks
-    displayExcerpt = displayExcerpt
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/\n/g, '<br>');
-    
-    return `
-        <div style="padding: 8px; font-family: sans-serif;">
-            <div style="font-weight: bold; margin-bottom: 6px; font-size: 11px; color: #999; border-bottom: 1px solid #ddd; padding-bottom: 4px;">
-                Text Excerpt (Position ${startPos}-${endPos})
-            </div>
-            <div style="font-size: 13px; line-height: 1.5; max-height: 200px; overflow-y: auto; white-space: pre-wrap; word-wrap: break-word;">
-                "${displayExcerpt}"
-            </div>
-        </div>
-    `;
-}
-
-// Update the initializeExcerptTooltips function with better error handling
-function initializeExcerptTooltips() {
-    // Destroy any existing Tippy instances to avoid duplicates
-    $('.selection-with-excerpt, .selection-with-pdf-coords').each(function() {
-        if (this._tippy) {
-            this._tippy.destroy();
-        }
-    });
-
-    // Initialize Tippy for all selection elements
-    tippy('.selection-with-excerpt, .selection-with-pdf-coords', {
-        content: 'Loading...',
-        allowHTML: true,
-        interactive: true,
-        theme: 'light-border',
-        maxWidth: 450,
-        placement: 'top',
-        trigger: 'mouseenter focus',
-        delay: [200, 200], // 200ms delay on show/hide
-        appendTo: () => document.body, // Append to body to prevent clipping
-        onShow(instance) {
-            const element = instance.reference;
-            
-            // If content is already loaded, show it immediately
-            if (element.getAttribute('data-tooltip-loaded') === 'true') {
-                return; // Content already set, just show the tooltip
-            }
-
-            if (element.classList.contains('selection-with-excerpt')) {
-                // Handle text excerpt tooltips
-                const startPos = parseInt(element.getAttribute('data-start'));
-                const endPos = parseInt(element.getAttribute('data-end'));
-                const plainTextPath = element.getAttribute('data-path');
-                const sourceGuid = element.getAttribute('data-source-guid');
-
-                // Set loading state
-                instance.setContent('<div style="padding: 8px;"><em>Loading excerpt...</em></div>');
-
-                // Load the excerpt asynchronously
-                loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid)
-                    .then(excerpt => {
-                        if (excerpt) {
-                            let formattedContent = formatExcerptTooltip(excerpt, startPos, endPos);
-                            // For merged selections, prepend the PDF coordinate info
-                            if (element.classList.contains('selection-with-pdf-coords')) {
-                                const pdfInfo = element.getAttribute('data-tippy-content');
-                                if (pdfInfo) {
-                                    const pdfHtml = `<div style="padding: 8px 8px 0 8px; font-family: sans-serif; font-size: 11px; color: #999;">${pdfInfo}</div>`;
-                                    formattedContent = pdfHtml + formattedContent;
-                                }
-                            }
-                            instance.setContent(formattedContent);
-                            element.setAttribute('data-tooltip-loaded', 'true');
-                        } else {
-                            instance.setContent('<div style="padding: 8px; color: #999;"><em>Could not load excerpt</em></div>');
-                        }
-                    })
-                    .catch(error => {
-                        console.error('Error loading excerpt:', error);
-                        instance.setContent(`<div style="padding: 8px; color: #d32f2f;"><em>Error: ${error.message || 'Could not load excerpt'}</em></div>`);
-                    });
-            }
-        },
-        onHidden(instance) {
-            // Optional: Clear loading state when hidden
-            // This allows the tooltip to reload if shown again
-            // Remove this if you want to keep cached content
-            // instance.reference.removeAttribute('data-tooltip-loaded');
-        }
-    });
-}
-
-// Function to load text excerpt from file
-async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
-    try {
-        // Check cache first - cache the full text to avoid repeated zip reads
-        if (textSourceCache.has(sourceGuid)) {
-            const fullText = textSourceCache.get(sourceGuid);
-            return fullText.substring(startPos, endPos);
-        }
-
-        // For zip mode, use the fetchTextExcerpt function from refiqdpx.js
-        if (isZipMode() && typeof fetchTextExcerpt === 'function') {
-            // fetchTextExcerpt already handles the substring extraction
-            let bagPath = plainTextPath.replace("internal://","sources/");
-            const excerpt = await fetchTextExcerpt(bagPath, startPos, endPos);
-            
-            // Note: We're not caching here because fetchTextExcerpt is efficient
-            // and only fetches the bytes we need. If you want to cache full files
-            // for multiple excerpts from the same file, you'd need to modify
-            // fetchTextExcerpt to optionally return the full text
-            return excerpt;
-        } else {
-            // Fallback for non-zip mode (direct file access)
-            const response = await fetch(plainTextPath);
-            if (!response.ok) {
-                console.warn('Could not load file:', plainTextPath);
-                return null;
-            }
-            const fileContent = await response.text();
-            
-            // Cache the full text for future excerpts from the same file
-            textSourceCache.set(sourceGuid, fileContent);
-            
-            // Return the excerpt
-            return fileContent.substring(startPos, endPos);
-        }
-    } catch (error) {
-        console.error('Error loading text excerpt:', error);
-        return null;
-    }
-}
->>>>>>> refs/heads/QDAS

From 07a4c394bb268983a8f2c094b4c67f1aed026436 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 27 Feb 2026 14:05:12 -0500
Subject: [PATCH 11/16] select all/none and redact buttons

---
 previewers/betatest/REFIQDAPreview.html  |  9 +---
 previewers/betatest/REFIQDPXPreview.html | 10 +---
 previewers/betatest/js/refiqdacore.js    | 66 +++++++++++++++++++-----
 3 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/previewers/betatest/REFIQDAPreview.html b/previewers/betatest/REFIQDAPreview.html
index 20d66ee..3f3a563 100644
--- a/previewers/betatest/REFIQDAPreview.html
+++ b/previewers/betatest/REFIQDAPreview.html
@@ -6,9 +6,8 @@
     <title class="refiqdaPreviewText">REFI-QDA Preview</title>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
     <script type="text/javascript" src="js/xss.js"></script>
-    <link href="https://cdn.datatables.net/v/dt/dt-2.3.5/sb-1.8.4/sl-3.1.3/datatables.min.css" rel="stylesheet" integrity="sha384-DpDi3pDJ2463LMrQcpHQvB1a5fUBPyXzbcEwddvQf8pQoEV7wcuoPRmD80IcKSui" crossorigin="anonymous">
-    <script src="https://cdn.datatables.net/v/dt/dt-2.3.5/sb-1.8.4/sl-3.1.3/datatables.min.js" integrity="sha384-3uEOa3r5q7Ds0Hy3F6S6bAIKatT3XgusNgosaq0b6RbFdy+AtzwpqMPmCxosv6T9" crossorigin="anonymous"></script>
-    <script src="https://unpkg.com/@popperjs/core@2"></script>
+    <link href="https://cdn.datatables.net/v/dt/dt-2.3.7/b-3.2.6/sl-3.1.3/datatables.min.css" rel="stylesheet" integrity="sha384-9yFi5daN2JbhIggBjwc0HdEbwVl9JkZIJtEJqe9jj1tvEQNNnBAn+kgqPlXDrSDD" crossorigin="anonymous">
+    <script src="https://cdn.datatables.net/v/dt/dt-2.3.7/b-3.2.6/sl-3.1.3/datatables.min.js" integrity="sha384-vKlJ3Fd2BmxNNmrgkf/yAi4RQ8BJvEurqwWXHtJZYcWkIfUFJEoBxxOpSgNBOGW1" crossorigin="anonymous"></script>    <script src="https://unpkg.com/@popperjs/core@2"></script>
     <script src="https://unpkg.com/tippy.js@6"></script>
     <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/dist/tippy.css" />
     <script type="text/javascript" src="js/refiqda.js"></script>
@@ -26,11 +25,7 @@
         integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
     <link type="text/css" rel="stylesheet" href="css/preview.css" />
     <link type="text/css" rel="stylesheet" href="css/refiqdas.css"/>
-<<<<<<< HEAD
     <link type="text/css" rel="stylesheet" href="css/fontcustom.css"/>
-=======
->>>>>>> refs/heads/QDAS
-</head>
 
 <body class="container">
     <main>
diff --git a/previewers/betatest/REFIQDPXPreview.html b/previewers/betatest/REFIQDPXPreview.html
index 3fc4b05..3da0aa4 100644
--- a/previewers/betatest/REFIQDPXPreview.html
+++ b/previewers/betatest/REFIQDPXPreview.html
@@ -15,10 +15,8 @@
     <script src="lib/jquery.i18n.js"></script>
     <script src="lib/jquery.i18n.messagestore.js"></script>
     <script src="lib/jquery.i18n.language.js"></script>
-    <link href="https://cdn.datatables.net/v/dt/dt-2.3.5/sb-1.8.4/sl-3.1.3/datatables.min.css" rel="stylesheet" integrity="sha384-DpDi3pDJ2463LMrQcpHQvB1a5fUBPyXzbcEwddvQf8pQoEV7wcuoPRmD80IcKSui" crossorigin="anonymous">
-    <script src="https://cdn.datatables.net/v/dt/dt-2.3.5/sb-1.8.4/sl-3.1.3/datatables.min.js" integrity="sha384-3uEOa3r5q7Ds0Hy3F6S6bAIKatT3XgusNgosaq0b6RbFdy+AtzwpqMPmCxosv6T9" crossorigin="anonymous"></script>
-    <script type="text/javascript" src="js/retriever.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/cytoscape/3.21.0/cytoscape.min.js"></script>
+    <link href="https://cdn.datatables.net/v/dt/dt-2.3.7/b-3.2.6/sl-3.1.3/datatables.min.css" rel="stylesheet" integrity="sha384-9yFi5daN2JbhIggBjwc0HdEbwVl9JkZIJtEJqe9jj1tvEQNNnBAn+kgqPlXDrSDD" crossorigin="anonymous">
+    <script src="https://cdn.datatables.net/v/dt/dt-2.3.7/b-3.2.6/sl-3.1.3/datatables.min.js" integrity="sha384-vKlJ3Fd2BmxNNmrgkf/yAi4RQ8BJvEurqwWXHtJZYcWkIfUFJEoBxxOpSgNBOGW1" crossorigin="anonymous"></script>    <script src="https://cdnjs.cloudflare.com/ajax/libs/cytoscape/3.21.0/cytoscape.min.js"></script>
     <!-- Latest compiled and minified CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
         integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
@@ -27,11 +25,7 @@
         integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
     <link type="text/css" rel="stylesheet" href="css/preview.css" />
     <link type="text/css" rel="stylesheet" href="css/refiqdas.css"/>
-<<<<<<< HEAD
     <link type="text/css" rel="stylesheet" href="css/fontcustom.css"/>
-=======
->>>>>>> refs/heads/QDAS
-</head>
 
 <body class="container">
     <main>
diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 5917d0c..2702baa 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -421,7 +421,7 @@ function parseData2(data) {
         });
 
         sourceDataTable = new DataTable(".sourcetable", {
-          select: $('#filterby').val() == 'Sources',
+         select: $('#filterby').val() == 'Sources',
           order: [[0, 'asc']],
           columnDefs: [
             {
@@ -783,14 +783,36 @@ $("#filterby")
         $('.redact-btn').remove();
       }
       if ($(".sourcetable").length) {
-        sourceDataTable = new DataTable(".sourcetable", {
-          select: $('#filterby').val() == 'Sources'
-        });
+        let dtOptions = {
+          select: $('#filterby').val() == 'Sources',
+          columnDefs: [
+            {
+              render: function(data, type, row) {
+                if (type === 'display' && data !== null && data.length > 50) {
+                  return '<span title="' + data + '">' + data.substr(0, 50) + '...</span>';
+                }
+                return data;
+              },
+              targets: 1
+            }
+          ]
+          
+        };
+
+        if ($('#filterby').val() == 'Sources') {
+          dtOptions.layout = {
+            top2End: 'buttons'
+          };
+          dtOptions.buttons = ['selectAll', 'selectNone'];
+        }
+
+        sourceDataTable = new DataTable(".sourcetable", dtOptions);
         attachFilterHandler(sourceDataTable);
-        sourceDataTable.draw();
         if ($('#filterby').val() == 'Sources') {
             addRedactionButton(sourceDataTable, $('#sources'));
         }
+        sourceDataTable.draw();
+
         tables.push(sourceDataTable);
       }
 
@@ -1233,32 +1255,47 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
     }
 }
 
-function addRedactionButton(dataTable, tableContainer) {
+function addRedactionButton(dataTable) {
+  // Create the button with jQuery
   const redactButton = $('<button>Create Redacted Project from Selection</button>')
     .addClass('redact-btn')
-    .hide()
+    .hide() // Initially hidden
     .on('click', function() {
       const selectedRows = dataTable.rows({ selected: true }).data();
       const guidsToRedact = [];
-      for (let i = 0; i < selectedRows.length; i++) {
-        // Assuming the GUID is stored in a data attribute of the row
-        const rowNode = dataTable.row(selectedRows.nodes()[i]).node();
+      
+      // Get GUID from the data of selected rows
+      dataTable.rows({ selected: true }).every(function() {
+        const rowNode = this.node();
         const guid = $(rowNode).data('guid');
         if (guid) {
           guidsToRedact.push(guid);
         }
-      }
+      });
+
       if (guidsToRedact.length > 0) {
         redactSources(guidsToRedact);
       } else {
         alert("No sources selected for redaction.");
       }
     });
-  tableContainer.find('h2').first().append(redactButton);
 
+  // Find or create the DataTables button container
+  let buttonContainer = $(dataTable.table().container()).find('.dt-buttons');
+  if (buttonContainer.length === 0) {
+    // If the button container doesn't exist, create it and prepend it
+    // to the main DataTables control header.
+    buttonContainer = $('<div class="dt-buttons btn-group"/>');
+    $(dataTable.table().container()).find('.dataTables_filter').before(buttonContainer);
+  }
+  
+  // Append the button to the container
+  buttonContainer.append(redactButton);
+
+  // Show/hide button on selection change
   dataTable.on('select deselect', function() {
-    const selectedRows = dataTable.rows({ selected: true }).count();
-    if (selectedRows > 0) {
+    const selectedCount = dataTable.rows({ selected: true }).count();
+    if (selectedCount > 0) {
       redactButton.show();
     } else {
       redactButton.hide();
@@ -1266,6 +1303,7 @@ function addRedactionButton(dataTable, tableContainer) {
   });
 }
 
+
 function redactSources(guidsToRedact) {
   console.log("Redacting sources with GUIDs:", guidsToRedact);
   alert("Redaction functionality is not yet implemented.\nSelected source GUIDs: " + guidsToRedact.join(', '));

From b408a489d253bee32e0e4ef354b8d6a0e0c4ddfd Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 27 Feb 2026 14:40:25 -0500
Subject: [PATCH 12/16] remove old select/unselect code, create redact button
 plugin, style

remove old add button code
---
 previewers/betatest/js/refiqdacore.js | 118 ++++++--------------------
 1 file changed, 25 insertions(+), 93 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 2702baa..6b99415 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -23,44 +23,6 @@ function translateBaseHtmlPage() {
   $('.refiqdaPreviewText').text(refiqdaPreviewText);
 }
 
-function addSelectAllAndUnselectButtons(dataTable, tableContainer, tableId) {
-  // Add "Unselect All" button next to the table title
-  const unselectAllButton = $('<button>Unselect All</button>')
-    .addClass('unselect-all-btn')
-    .hide()
-    .on('click', function() {
-      dataTable.rows({ selected: true }).deselect();
-    });
-  tableContainer.find('h2').first().append(unselectAllButton);
-
-  // Add "Select All" checkbox to the table header
-  const selectAllCheckbox = $('<input type="checkbox" title="Select all rows in this table" />');
-  $('#' + tableId + ' thead tr').prepend($('<th class="select-all">').append(selectAllCheckbox));
-  $('#' + tableId + ' tbody tr').prepend($('<td class="select-all">')); // Placeholder for alignment
-
-  selectAllCheckbox.on('click', function() {
-    if (this.checked) {
-      dataTable.rows().select();
-    } else {
-      dataTable.rows().deselect();
-    }
-  });
-
-  // Show/hide "Unselect All" button and manage "Select All" checkbox state
-  dataTable.on('select deselect', function() {
-    const selectedRows = dataTable.rows({ selected: true }).count();
-    const totalRows = dataTable.rows().count();
-
-    if (selectedRows > 0) {
-      unselectAllButton.show();
-    } else {
-      unselectAllButton.hide();
-    }
-
-    selectAllCheckbox.prop('checked', selectedRows === totalRows);
-  });
-}
-
 var zipUrl = '';
 
 //zipUrl is set in refiqdpx.js - the zip file case
@@ -445,8 +407,6 @@ function parseData2(data) {
         }
 
         tables.push(sourceDataTable);
-        addSelectAllAndUnselectButtons(sourceDataTable, sourceBlock, 'sourcetable');
-        addRedactionButton(sourceDataTable, sourceBlock);
       }
 
     }
@@ -780,7 +740,6 @@ $("#filterby")
       if (sourceDataTable) {
         sourceDataTable.destroy();
         $(".sourcetable").off('select.dt deselect.dt');
-        $('.redact-btn').remove();
       }
       if ($(".sourcetable").length) {
         let dtOptions = {
@@ -803,14 +762,36 @@ $("#filterby")
           dtOptions.layout = {
             top2End: 'buttons'
           };
-          dtOptions.buttons = ['selectAll', 'selectNone'];
+          dtOptions.buttons = [
+            'selectAll', 
+            'selectNone',
+            {
+              text: 'Redact',
+              className: 'redact-btn',
+              titleAttr: 'Create a redacted version of the datafile with the selected sources, and any related annotations, removed.',
+              action: function ( e, dt, node, config ) {
+                let selectedRows = dt.rows( { selected: true } );
+                let sourceGuids = [];
+                selectedRows.nodes().to$().each(function() {
+                    sourceGuids.push($(this).data('guid'));
+                });
+                redactSources(sourceGuids);
+              },
+              enabled: false
+            }
+          ];
         }
 
         sourceDataTable = new DataTable(".sourcetable", dtOptions);
-        attachFilterHandler(sourceDataTable);
+        
         if ($('#filterby').val() == 'Sources') {
-            addRedactionButton(sourceDataTable, $('#sources'));
+            sourceDataTable.on('select deselect', function () {
+                var selectedRows = sourceDataTable.rows({ selected: true }).count();
+                sourceDataTable.button('.redact-btn').enable(selectedRows > 0);
+            });
         }
+        
+        attachFilterHandler(sourceDataTable);
         sourceDataTable.draw();
 
         tables.push(sourceDataTable);
@@ -1255,55 +1236,6 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
     }
 }
 
-function addRedactionButton(dataTable) {
-  // Create the button with jQuery
-  const redactButton = $('<button>Create Redacted Project from Selection</button>')
-    .addClass('redact-btn')
-    .hide() // Initially hidden
-    .on('click', function() {
-      const selectedRows = dataTable.rows({ selected: true }).data();
-      const guidsToRedact = [];
-      
-      // Get GUID from the data of selected rows
-      dataTable.rows({ selected: true }).every(function() {
-        const rowNode = this.node();
-        const guid = $(rowNode).data('guid');
-        if (guid) {
-          guidsToRedact.push(guid);
-        }
-      });
-
-      if (guidsToRedact.length > 0) {
-        redactSources(guidsToRedact);
-      } else {
-        alert("No sources selected for redaction.");
-      }
-    });
-
-  // Find or create the DataTables button container
-  let buttonContainer = $(dataTable.table().container()).find('.dt-buttons');
-  if (buttonContainer.length === 0) {
-    // If the button container doesn't exist, create it and prepend it
-    // to the main DataTables control header.
-    buttonContainer = $('<div class="dt-buttons btn-group"/>');
-    $(dataTable.table().container()).find('.dataTables_filter').before(buttonContainer);
-  }
-  
-  // Append the button to the container
-  buttonContainer.append(redactButton);
-
-  // Show/hide button on selection change
-  dataTable.on('select deselect', function() {
-    const selectedCount = dataTable.rows({ selected: true }).count();
-    if (selectedCount > 0) {
-      redactButton.show();
-    } else {
-      redactButton.hide();
-    }
-  });
-}
-
-
 function redactSources(guidsToRedact) {
   console.log("Redacting sources with GUIDs:", guidsToRedact);
   alert("Redaction functionality is not yet implemented.\nSelected source GUIDs: " + guidsToRedact.join(', '));

From 72649aebee7fcfd25f75658f7284e66a225fa93f Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Sat, 28 Feb 2026 13:42:40 -0500
Subject: [PATCH 13/16] fix download links, initial redaction in codebook

---
 previewers/betatest/js/refiqdacore.js | 40 +++++++++++++++++----------
 previewers/betatest/js/refiqdpx.js    | 12 +++++---
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 6b99415..7a7f479 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -1073,23 +1073,18 @@ function createPdfSelectionWithTooltip(selectionName, page, firstX, firstY, seco
 function createSourceReference(source) {
     let sourceName = source.getAttribute("name");
     let plainTextPath = source.getAttribute("plainTextPath");
-    
+    let path = plainTextPath.replace("internal://","sources/")
     if (isZipMode()) {
         // In zip mode, create a link that uses the zip entry
-        if (typeof entryMap !== 'undefined' && plainTextPath && entryMap[plainTextPath] !== undefined) {
-            let entryIndex = entryMap[plainTextPath];
-            return '<a href="#" data-entry-index="' + entryIndex + '">' + sourceName + '</a>';
+        if (typeof entryMap !== 'undefined' && path && entryMap[path] !== undefined) {
+            let entryIndex = entryMap[path];
+            return sourceName + ' <a href="#" data-entry-index="' + entryIndex + '" data-entry-name="' + sourceName + '" title="Download Source: ' + sourceName + '"><span class="glyphicon glyphicon-download-alt"></span></a>';
         } else {
             // No link if file not found in zip
             return sourceName;
         }
     } else {
-        // In non-zip mode, create a direct link to the file if it exists
-        if (plainTextPath) {
-            return '<a href="' + plainTextPath + '" target="_blank">' + sourceName + '</a>';
-        } else {
-            return sourceName;
-        }
+        return sourceName;
     }
 }
 
@@ -1237,10 +1232,25 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
 }
 
 function redactSources(guidsToRedact) {
-  console.log("Redacting sources with GUIDs:", guidsToRedact);
-  alert("Redaction functionality is not yet implemented.\nSelected source GUIDs: " + guidsToRedact.join(', '));
+ console.log("Redacting sources with GUIDs:", guidsToRedact);
+
+  let redactedXmlDoc = xmlDoc.cloneNode(true);
+
+  for (const guid of guidsToRedact) {
+    // Find any source element by its GUID and remove it.
+    // This will also remove all its children, including annotations.
+    let sourceElement = redactedXmlDoc.querySelector('[guid="' + guid + '"]');
+    if (sourceElement && sourceElement.parentNode) {
+      sourceElement.parentNode.removeChild(sourceElement);
+      console.log("Removed source element and its annotations with GUID:", guid);
+    }
+  }
+
+  // For now, let's just log the redacted XML to the console to verify
+  console.log("Redacted XML:", new XMLSerializer().serializeToString(redactedXmlDoc));
+  alert("Redaction of XML complete. See console for redacted XML. Next steps will handle file saving.");
+
   // In the next steps, we will implement the logic here to:
-  // 1. Modify the XML codebook to remove selected sources and their annotations.
-  // 2. If it's a zip file, remove the source files from the archive.
-  // 3. POST the new redacted file to Dataverse.
+  // 1. If it's a zip file, remove the source files from the archive.
+  // 2. POST the new redacted file to Dataverse.
 }
diff --git a/previewers/betatest/js/refiqdpx.js b/previewers/betatest/js/refiqdpx.js
index 3d692d3..79b8060 100644
--- a/previewers/betatest/js/refiqdpx.js
+++ b/previewers/betatest/js/refiqdpx.js
@@ -128,12 +128,13 @@ async function downloadFile(event) {
 }
 
 async function download(entry, li, a) {
-    if (!li.classList.contains("busy")) {
+    const parentCell = $(a).closest('td');
+    if (!parentCell.hasClass("busy")) {
 
         const controller = new AbortController();
         const signal = controller.signal;
 
-        li.classList.add("busy");
+        parentCell.addClass("busy");
         try {
             const blobURL = URL.createObjectURL(await entry.getData(new zip.BlobWriter(), {
                 onprogress: (index, max) => {
@@ -146,8 +147,11 @@ async function download(entry, li, a) {
             }))
             var index = a.getAttribute("data-entry-index");
             console.log("index: " + index);
+
+            const filename = a.getAttribute("data-entry-name");
+
             $("a[data-entry-index='" + index + "']").attr('href',blobURL);
-             $("a[data-entry-index='" + index + "']").attr('download',a.text);
+             $("a[data-entry-index='" + index + "']").attr('download', filename || a.text);
             const clickEvent = new MouseEvent("click");
             a.dispatchEvent(clickEvent);
         } catch (error) {
@@ -155,7 +159,7 @@ async function download(entry, li, a) {
                 throw error;
             }
         } finally {
-            li.classList.remove("busy");
+            parentCell.removeClass("busy");
         }
     }
 }

From d953dac8b943538df40f6a36b1c4409b5ea34cf0 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Tue, 3 Mar 2026 09:21:43 -0500
Subject: [PATCH 14/16] add redaction, fix links, update curl examples

---
 6.1curlcommands.md                    | 134 ++++++++++++++-
 previewers/betatest/js/refiqda.js     |   2 +-
 previewers/betatest/js/refiqdacore.js | 234 +++++++++++++++++++++++---
 previewers/betatest/js/refiqdpx.js    |   6 +-
 previewers/betatest/js/retriever.js   |   2 +
 5 files changed, 344 insertions(+), 34 deletions(-)

diff --git a/6.1curlcommands.md b/6.1curlcommands.md
index 143542c..4078d3a 100644
--- a/6.1curlcommands.md
+++ b/6.1curlcommands.md
@@ -2008,7 +2008,61 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
 These previewers support the [REFI-QDA standard](https://www.qdasoftware.org/) format for qualitative research files.
 They allow viewing of the authors, codes, sources, annotations, and relationships listed in the codebook, 
 with added functionality to view code use frequency and filter by the entries in these tables. The REFI-QDA Project previewer
-also allows viewing the annotation anchor text retrieved from the zipped source files.
+also allows viewing the annotation anchor text retrieved from the zipped source files and download of the original and text versions of source files.
+Further, for users who can edit the dataset, the Codebook and Project Previewers allow creation of "redacted" versions that become publicly previewable 
+even when the datafiles themselves are restricted. The "View *" previewers will only show when the user can download the datafile, while the "View Redacted *" previewers
+will show all the time. As the first available previewer shows as the default one in the dataset files table, it is recommended that these previewers
+be installed in the order shown below (so the full previewers are the default for those who can download the datafile).
+
+
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+  "displayName":"View REFI-QDA Codebook",
+  "description":"View the contents of a REFI-QDA codebook file.",
+  "toolName":"refiqdaCodebookPreviewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"/dataverse-previewers/previewers/betatest/REFIQDAPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"text/x-xml-refiqda",
+  "allowedApiCalls": [
+    {
+      "name": "retrieveFileContents",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}?gbrecs=true",
+      "timeOut": 3600
+    },
+    {
+      "name": "downloadFile",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}?gbrecs=false",
+      "timeOut": 3600
+    },
+    {
+      "name": "uploadRedactedFile",
+      "httpMethod": "POST",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdc/1.0",
+      "timeOut": 3600
+    },
+    {
+      "name": "getDatasetVersionMetadata",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/datasets/{datasetId}/versions/{datasetVersion}",
+      "timeOut": 3600
+    }
+  ]
+}'
+```
 
 ```bash
 curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
@@ -2018,7 +2072,7 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
   "toolName":"refiqdaProjectPreviewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/betatest/REFIQDPXPreview.html",
+  "toolUrl":"/dataverse-previewers/previewers/betatest/REFIQDPXPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -2042,6 +2096,12 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
       "urlTemplate": "/api/v1/access/datafile/{fileId}?gbrecs=false",
       "timeOut": 3600
     },
+    {
+      "name": "uploadRedactedFile",
+      "httpMethod": "POST",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdpx/1.0",
+      "timeOut": 3600
+    },
     {
       "name": "getDatasetVersionMetadata",
       "httpMethod": "GET",
@@ -2055,12 +2115,62 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
 ```bash
 curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
 '{
-  "displayName":"View REFI-QDA Codebook",
-  "description":"View the contents of a REFI-QDA codebook file.",
-  "toolName":"refiqdaCodebookPreviewer",
+  "displayName":"View Redacted REFI-QDA Project",
+  "description":"View the contents of a redacted EFI-QDA project file.",
+  "toolName":"refiqdaRedactedProjectPreviewer",
   "scope":"file",
   "types":["preview"],
-  "toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/betatest/REFIQDAPreview.html",
+  "toolUrl":"/dataverse-previewers/previewers/betatest/REFIQDPXPreview.html",
+  "toolParameters": {
+      "queryParameters":[
+        {"fileid":"{fileId}"},
+        {"siteUrl":"{siteUrl}"},
+        {"datasetid":"{datasetId}"},
+        {"datasetversion":"{datasetVersion}"},
+        {"locale":"{localeCode}"}
+      ]
+    },
+  "contentType":"application/x-zip-refiqda",
+  "requirements": {
+    "auxFilesExist": [
+      {
+        "formatTag": "qdpx",
+        "formatVersion": "1.0"
+      }
+    ]
+  },
+  "allowedApiCalls": [
+    {
+      "name": "retrieveFileContents",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdpx/1.0?gbrecs=true",
+      "timeOut": 3600
+    },
+    {
+      "name": "downloadFile",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdpx/1.0?gbrecs=false",
+      "timeOut": 3600
+    },
+    {
+      "name": "getDatasetVersionMetadata",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/datasets/{datasetId}/versions/{datasetVersion}",
+      "timeOut": 3600
+    }
+  ]
+}'
+```
+
+```bash
+curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
+'{
+ "displayName":"View Redacted REFI-QDA Codebook",
+  "description":"View the contents of a redacted REFI-QDA codebook file.",
+  "toolName":"refiqdaRedactedCodebookPreviewer",
+  "scope":"file",
+  "types":["preview"],
+  "toolUrl":"/dataverse-previewers/previewers/betatest/REFIQDAPreview.html",
   "toolParameters": {
       "queryParameters":[
         {"fileid":"{fileId}"},
@@ -2071,17 +2181,25 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
       ]
     },
   "contentType":"text/x-xml-refiqda",
+  "requirements": {
+    "auxFilesExist": [
+      {
+        "formatTag": "qdc",
+        "formatVersion": "1.0"
+      }
+    ]
+  },
   "allowedApiCalls": [
     {
       "name": "retrieveFileContents",
       "httpMethod": "GET",
-      "urlTemplate": "/api/v1/access/datafile/{fileId}?gbrecs=true",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdc/1.0?gbrecs=true",
       "timeOut": 3600
     },
     {
       "name": "downloadFile",
       "httpMethod": "GET",
-      "urlTemplate": "/api/v1/access/datafile/{fileId}?gbrecs=false",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdc/1.0?gbrecs=false",
       "timeOut": 3600
     },
     {
diff --git a/previewers/betatest/js/refiqda.js b/previewers/betatest/js/refiqda.js
index c11ec16..b9a047b 100644
--- a/previewers/betatest/js/refiqda.js
+++ b/previewers/betatest/js/refiqda.js
@@ -16,5 +16,5 @@ function writeContent(fileUrl, file, title, authors) {
   }
   fetch(fileUrl)
     .then(response => response.text())
-    .then(data => parseData(data));
+    .then(data => parseData(data, file));
 }
diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 7a7f479..749dbf9 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -12,6 +12,7 @@ var sourceDataTable;
 var setDataTable;
 var tables = new Array();
 
+let file;
 var textSourceCache = new Map(); // Cache for loaded text files
 
 $(document).ready(function() {
@@ -48,7 +49,8 @@ function findDataAttribute(name, attrNamedNodeMap) {
 
 // Start parsing project file
 // This function just adds a loading icon and initial text to the page and then calls parseData2
-function parseData(data) {
+function parseData(data, filejson) {
+  file=filejson;
   $('#waiting').remove();
   wait = $('<div/>').attr('id', 'waiting');
   $('<img/>').width('15%').attr('src', 'images/Loading_icon.gif').appendTo(wait);
@@ -1070,22 +1072,91 @@ function createPdfSelectionWithTooltip(selectionName, page, firstX, firstY, seco
     return spanHtml;
 }
 
-function createSourceReference(source) {
-    let sourceName = source.getAttribute("name");
-    let plainTextPath = source.getAttribute("plainTextPath");
-    let path = plainTextPath.replace("internal://","sources/")
-    if (isZipMode()) {
-        // In zip mode, create a link that uses the zip entry
-        if (typeof entryMap !== 'undefined' && path && entryMap[path] !== undefined) {
-            let entryIndex = entryMap[path];
-            return sourceName + ' <a href="#" data-entry-index="' + entryIndex + '" data-entry-name="' + sourceName + '" title="Download Source: ' + sourceName + '"><span class="glyphicon glyphicon-download-alt"></span></a>';
-        } else {
-            // No link if file not found in zip
-            return sourceName;
+function createSourceReference(sourceElement) {
+    const sourceName = sourceElement.getAttribute("name");
+    const sourceGuid = sourceElement.getAttribute("guid");
+    const path = sourceElement.getAttribute("path");
+    const plainTextPath = sourceElement.getAttribute("plainTextPath");
+    const richTextPath = sourceElement.getAttribute("richTextPath");
+
+    const referenceDiv = document.createElement('div');
+    referenceDiv.className = 'source-reference';
+
+    const nameSpan = document.createElement('span');
+    nameSpan.textContent = `${sourceName} (`;
+    referenceDiv.appendChild(nameSpan);
+
+    const links = [];
+
+    // Handle binary files (like PDFs) that have a 'path'
+    if (path) {
+        const pdfLink = document.createElement('a');
+        pdfLink.href = '#';
+        pdfLink.textContent = 'PDF';
+        pdfLink.title = 'Download PDF';
+        pdfLink.onclick = (e) => {
+            e.preventDefault();
+            downloadSourceFile(sourceGuid, path);
+        };
+        links.push(pdfLink);
+
+        // Check for a plain text representation of the binary file
+        const representation = sourceElement.querySelector('Representation[plainTextPath]');
+        if (representation) {
+            const textRepresentationPath = representation.getAttribute('plainTextPath');
+            const textLink = document.createElement('a');
+            textLink.href = '#';
+            textLink.textContent = 'TXT';
+            textLink.title='Download Text';
+            textLink.onclick = (e) => {
+                e.preventDefault();
+                downloadSourceFile(sourceGuid, textRepresentationPath);
+            };
+            links.push(textLink);
         }
-    } else {
-        return sourceName;
     }
+    // Handle plain text files that only have a 'plainTextPath'
+    else if (plainTextPath) {
+        const textLink = document.createElement('a');
+        textLink.href = '#';
+        textLink.textContent = 'TXT';
+        textLink.title = 'Download Text';
+        textLink.onclick = (e) => {
+            e.preventDefault();
+            downloadSourceFile(sourceGuid, plainTextPath);
+        };
+        links.push(textLink);
+    }
+
+    // Handle rich text files (like DOCX) that have a 'richTextPath'
+    if (richTextPath) {
+        const richTextLink = document.createElement('a');
+        richTextLink.href = '#';
+        const extension = richTextPath.split('.').pop().toUpperCase();
+        richTextLink.textContent = extension;
+        richTextLink.title = 'Download Rich Text';
+        richTextLink.onclick = (e) => {
+            e.preventDefault();
+            downloadSourceFile(sourceGuid, richTextPath);
+        };
+        links.push(richTextLink);
+    }
+    
+    // Append all created links with separators
+    links.forEach((link, index) => {
+        referenceDiv.appendChild(link);
+        if (index < links.length - 1) {
+            const separator = document.createElement('span');
+            separator.textContent = ' | ';
+            referenceDiv.appendChild(separator);
+        }
+    });
+
+    const closingParen = document.createElement('span');
+    closingParen.textContent = ')';
+    referenceDiv.appendChild(closingParen);
+
+    return referenceDiv;
 }
 
 function formatExcerptTooltip(excerpt, startPos, endPos) {
@@ -1232,7 +1303,22 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
 }
 
 function redactSources(guidsToRedact) {
- console.log("Redacting sources with GUIDs:", guidsToRedact);
+  console.log("Redacting sources with GUIDs:", guidsToRedact);
+
+  // Find the paths of the source files to remove from the zip archive.
+  const pathsToRemove = new Set();
+  for (const guid of guidsToRedact) {
+    const sourceElement = xmlDoc.querySelector(`[guid="${guid}"]`);
+    if (sourceElement) {
+      const plainTextPath = sourceElement.getAttribute("plainTextPath");
+      if (plainTextPath) {
+        // The path in the zip is typically "sources/..."
+        pathsToRemove.add(plainTextPath.replace("internal://", ""));
+      }
+    }
+  }
+  console.log("Paths to remove from zip:", Array.from(pathsToRemove));
+
 
   let redactedXmlDoc = xmlDoc.cloneNode(true);
 
@@ -1246,11 +1332,115 @@ function redactSources(guidsToRedact) {
     }
   }
 
-  // For now, let's just log the redacted XML to the console to verify
-  console.log("Redacted XML:", new XMLSerializer().serializeToString(redactedXmlDoc));
-  alert("Redaction of XML complete. See console for redacted XML. Next steps will handle file saving.");
+  const redactedXmlString = new XMLSerializer().serializeToString(redactedXmlDoc);
+
+  if (isZipMode() && typeof zip !== 'undefined') {
+    // Use an async function to handle zip operations
+    (async () => {
+ try {
+        // Fetch the original zip file as a blob on-demand
+        const zipResponse = await fetch(zipUrl);
+        if (!zipResponse.ok) {
+          throw new Error(`HTTP error! status: ${zipResponse.status}`);
+        }
+        zipFileBlob = await zipResponse.blob();
+
+        // 1. Create a new zip archive
+        const zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/x-zip-refiqda"));
+
+        // 2. Read entries from the original zip blob
+        const zipReader = new zip.ZipReader(new zip.BlobReader(zipFileBlob));
+        const entries = await zipReader.getEntries();
 
-  // In the next steps, we will implement the logic here to:
-  // 1. If it's a zip file, remove the source files from the archive.
-  // 2. POST the new redacted file to Dataverse.
+        // 3. Copy entries to the new zip, excluding redacted files
+        for (const entry of entries) {
+          if (entry.filename === "project.qde") {
+            // Skip the old project file; we'll add the new one later
+            continue;
+          }
+          if (!pathsToRemove.has(entry.filename)) {
+            await zipWriter.add(entry.filename, new zip.BlobReader(await entry.getData(new zip.BlobWriter())));
+          } else {
+            console.log(`Excluding ${entry.filename} from new zip.`);
+          }
+        }
+
+        // 4. Add the new, redacted project.qde
+        await zipWriter.add("project.qde", new zip.TextReader(redactedXmlString));
+
+        // 5. Finalize the new zip file
+        const redactedZipBlob = await zipWriter.close();
+
+        // 6. Prepare for upload
+        const formData = new FormData();
+        const originalFilename = file.filename || "project.qdpx";
+        const redactedFilename = originalFilename.replace(/(\.qdpx)?$/, '-redacted.qdpx');
+
+        formData.append("file", redactedZipBlob, redactedFilename);
+        formData.append("origin", "qdas");
+        formData.append("isPublic", "true"); // Or handle dynamically if needed
+        formData.append("type", "qda");
+
+        // 7. POST the new file to Dataverse
+        console.log(`Uploading redacted file: ${redactedFilename}`);
+        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
+          method: 'POST',
+          body: formData,
+          // Headers are not needed for FormData; browser sets them
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
+        }
+
+        const responseData = await response.json();
+        console.log("Upload successful:", responseData);
+        alert("Redacted file has been successfully uploaded to Dataverse.");
+
+      } catch (error) {
+        console.error("Error during redaction and upload:", error);
+        alert(`An error occurred during the redaction process: ${error.message}`);
+      }
+    })();
+  } else {
+    // Fallback for non-zip mode (single XML file)
+    (async () => {
+      try {
+        // 1. Create a blob from the redacted XML string
+        const redactedXmlBlob = new Blob([redactedXmlString], { type: 'text/x-xml-refiqda' });
+
+        // 2. Prepare for upload
+        const formData = new FormData();
+        const originalFilename = file.filename || "project.qdc";
+        const redactedFilename = originalFilename.replace(/(\.qdc)?$/, '-redacted.qdc');
+
+        formData.append("file", redactedXmlBlob, redactedFilename);
+        formData.append("origin", "qdas");
+        formData.append("isPublic", "true"); // Or handle dynamically if needed
+        formData.append("type", "qda");
+
+        // 3. POST the new file to Dataverse
+        console.log(`Uploading redacted file: ${redactedFilename}`);
+        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
+          method: 'POST',
+          body: formData,
+          // Headers are not needed for FormData; browser sets them
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
+        }
+
+        const responseData = await response.json();
+        console.log("Upload successful:", responseData);
+        alert("Redacted file has been successfully uploaded to Dataverse.");
+
+      } catch (error) {
+        console.error("Error during redaction and upload:", error);
+        alert(`An error occurred during the redaction process: ${error.message}`);
+      }
+    })();
+  }
 }
diff --git a/previewers/betatest/js/refiqdpx.js b/previewers/betatest/js/refiqdpx.js
index 79b8060..faf6f66 100644
--- a/previewers/betatest/js/refiqdpx.js
+++ b/previewers/betatest/js/refiqdpx.js
@@ -9,13 +9,13 @@ function writeContent(fileUrl, file, title, authors) {
     } else {
       redactedMode = false;
     }
-    readZip(fileUrl);
+    readZip(fileUrl, file);
 }
 
 let entries;
 const entryMap = {};
 
-async function readZip(fileUrl) {
+async function readZip(fileUrl, file) {
         wait = $('<div/>').attr('id', 'waiting');
         $('<img/>').width('15%').attr('src','images/Loading_icon.gif').attr('id','throbber').appendTo(wait);
         $('<span/>').text(' Reading QPDX file. Parsing Contents...').appendTo(wait);
@@ -48,7 +48,7 @@ async function readZip(fileUrl) {
 
                   },
                 });
-                projectBlob.then(text => parseData(text)).catch((err)=> {
+                projectBlob.then(text => parseData(text, file)).catch((err)=> {
                     document.getElementById('waiting').innerHTML= "<span>Unable to continue: " + err + "</span>";
                 });
 
diff --git a/previewers/betatest/js/retriever.js b/previewers/betatest/js/retriever.js
index 8d17611..a1741f6 100644
--- a/previewers/betatest/js/retriever.js
+++ b/previewers/betatest/js/retriever.js
@@ -38,6 +38,7 @@ function startPreview(retrieveFile) {
                             queryParams.preview = params.get('preview');
                         }
                         var urls = json.data.signedUrls;
+                        queryParams.signedUrls = {};
                         for (var i in urls) {
                             var url = urls[i];
                             switch (url.name) {
@@ -51,6 +52,7 @@ function startPreview(retrieveFile) {
                                     queryParams.versionUrl = url.signedUrl;
                                     break;
                                 default:
+                                    queryParams.signedUrls[url.name] = url.signedUrl;
                             }
                         }
                         continuePreview(retrieveFile, queryParams);

From d2834e2ed1f99626fa9bf42f09c20cf00ece38f4 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Tue, 3 Mar 2026 09:27:44 -0500
Subject: [PATCH 15/16] missing retriever script

---
 previewers/betatest/REFIQDPXPreview.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/previewers/betatest/REFIQDPXPreview.html b/previewers/betatest/REFIQDPXPreview.html
index 3da0aa4..79650aa 100644
--- a/previewers/betatest/REFIQDPXPreview.html
+++ b/previewers/betatest/REFIQDPXPreview.html
@@ -9,6 +9,7 @@
     <script src="https://unpkg.com/@popperjs/core@2"></script>
     <script src="https://unpkg.com/tippy.js@6"></script>
     <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/dist/tippy.css" />
+    <script type="text/javascript" src="js/retriever.js"></script>
     <script type="text/javascript" src="js/refiqdpx.js"></script>
     <script type="text/javascript" src="js/refiqdacore.js"></script>
     <script type="text/javascript" src="js/ziplocal.js"></script>

From 51a90da0fefd3e002ddad47cd5bf81961c82eacb Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Wed, 4 Mar 2026 14:30:46 -0500
Subject: [PATCH 16/16] fix merge issue

---
 previewers/betatest/css/refiqdas.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/previewers/betatest/css/refiqdas.css b/previewers/betatest/css/refiqdas.css
index 4c2e2e9..18d340e 100644
--- a/previewers/betatest/css/refiqdas.css
+++ b/previewers/betatest/css/refiqdas.css
@@ -64,13 +64,11 @@
 .tooltip-text {
   margin-top: 5px;
 }
-<<<<<<< HEAD
-=======
 
->>>>>>> refs/heads/QDAS
 label {
   margin-left:5px;
 }
+
 .redacted-notice {
   background-color: #fffbe6; /* A light yellow background */
   border: 1px solid #ffe58f; /* A slightly darker yellow border */