From 71a7fdfc53659b17576ca7358064666569845c49 Mon Sep 17 00:00:00 2001
From: RYAN A RIVERA <rrivera@FNAL.GOV>
Date: Thu, 12 Dec 2024 16:46:12 -0600
Subject: [PATCH 1/4] logbook and ECL improvments (still not totally
 functional), using 'category' instead of 'experiment'; Added Stop manual
 transition to Subsystem Launch; attempting to improve error handling when
 user does not have Lock; attempting to improve status/error feedback;

---
 WebGUI/css/SubsystemLaunch.css                |  11 +-
 WebGUI/html/Logbook.html                      | 368 ++++++++---------
 WebGUI/js/DesktopContent.js                   |  15 +-
 WebGUI/js/SubsystemLaunch.js                  |  25 +-
 .../ConfigurationGUISupervisor.cc             |   2 +-
 otsdaq-utilities/Console/ConsoleSupervisor.cc |  12 +-
 otsdaq-utilities/ECLWriter/ECLConnection.cpp  |   2 +-
 otsdaq-utilities/ECLWriter/ECLSupervisor.cc   | 342 +++++++++++-----
 otsdaq-utilities/ECLWriter/ECLSupervisor.h    |   7 +-
 otsdaq-utilities/Logbook/LogbookSupervisor.cc | 374 +++++++++---------
 otsdaq-utilities/Logbook/LogbookSupervisor.h  |  23 +-
 .../MacroMaker/MacroMakerSupervisor.cc        |   2 +-
 test/ots_mm_udp_interface.cpp                 |   2 +-
 13 files changed, 678 insertions(+), 507 deletions(-)

diff --git a/WebGUI/css/SubsystemLaunch.css b/WebGUI/css/SubsystemLaunch.css
index 58c2b5a4..8d1be6ed 100755
--- a/WebGUI/css/SubsystemLaunch.css
+++ b/WebGUI/css/SubsystemLaunch.css
@@ -43,7 +43,7 @@
 			color:					black;
 			text-weight:			bold;
 			text-shadow: 			0px 1px 0px rgba(255,255,255,.3), 
-									0px -1px 0px rgba(0,0,0,.7);
+									0px -1px 0px rgba(0,0,0,.7);			
 		}
 
 		.progressBar {
@@ -198,6 +198,15 @@
 			cursor: pointer;
 		}
 
+		.subsystem_detail {
+			font-size: 14px;
+			text-align: left;
+			font-family: 'Inconsolata', monospace;
+		}
+		.subsystem_console {
+			font-family: 'Inconsolata', monospace;
+		}
+
 		.subsystem_configAlias_select_info {
 			float: right;
 			background-color: darkblue;
diff --git a/WebGUI/html/Logbook.html b/WebGUI/html/Logbook.html
index 423cb43c..6a42281b 100755
--- a/WebGUI/html/Logbook.html
+++ b/WebGUI/html/Logbook.html
@@ -124,7 +124,7 @@
 				text-shadow: 0.1em 0.1em 0.2em black;
 			}
 			
-			#currentExperimentHeader {
+			#currentCategoryHeader {
 				font-weight: 800;
 		    	font-size: 22px;
 				color: rgb(255,183,74);
@@ -133,7 +133,7 @@
 				text-shadow: 0.1em 0.1em 0.2em black;
 			}
 			
-			#experimentList {
+			#categoryList {
 				overflow-y: scroll;		
 				text-align: right;
 				padding: 5px;
@@ -143,14 +143,14 @@
 				margin: 10px 0 5px 0;
 			}
 			
-			#clearActiveExperimentDiv a {
+			#clearActiveCategoryDiv a {
 				color: rgb(180,207,237);
 				font-weight: 800;
 				
 			}
 
 			
-			#experimentList a {
+			#categoryList a {
 				font-family: arial;
 				color: rgb(180,207,237);				
 			}
@@ -166,11 +166,11 @@
 				margin: 60px 50px 0 0;
 			}				
 			
-			#experimentTextBox {
+			#categoryTextBox {
 				width: 200px;
 			}
 			
-			#experimentClearIcon {
+			#categoryClearIcon {
 				margin: 6px 0 -6px -30px;
 			}
 
@@ -361,9 +361,9 @@
 			
 			//functions:			
 				//init()	
-				//setActiveExperiment(experiment)
-				//handleExperimentChangeRequest(req)
-				//handleGetExperimentListRequest(req)
+				//setActiveCategory(category)
+				//handleCategoryChangeRequest(req)
+				//handleGetCategoryListRequest(req)
 				//redrawLogbook()
 				//redrawExpandButtons()
 				//toggleArea(i)
@@ -378,15 +378,15 @@
 				//uploadComplete(evt)
 				//uploadFailed(evt)
 				//uploadCanceled(evt)
-				//handleExperimentInputKeyDown(e)
+				//handleCategoryInputKeyDown(e)
 				//handleSearchKeyUp()
 				//handleTimeoutSearchKeyUp()
-				//createExperiment()
-				//removeExperiment()
-				//displayExperiments()
-				//applyExperimentsSearch(needle)
-				//activeExperimentSetRequest(experiment)
-				//clearExperimentInput()
+				//createCategory()
+				//removeCategory()
+				//displayCategories()
+				//applyCategoriesSearch(needle)
+				//activeCategorySetRequest(category)
+				//clearCategoryInput()
 				//refreshLogbook(date,duration)
 				//handleRefreshLogbook(req)
 				//displayLogbookEntry(divEl,entry)
@@ -405,15 +405,15 @@
 			var _MARGIN = 20;
 			var _HIDDEN_HEIGHT = 33;
 			var _AREA_HEIGHTS = [270,390,500];
-			var _MAX_EXPERIMENT_NAME_LENGTH = 25;
+			var _MAX_CATEGORY_NAME_LENGTH = 300;
 			var _DEFAULT_ENTRY_INPUT_TEXT = "Enter the text for your logbook post here.";
 			var _DEFAULT_ENTRY_INPUT_SUBJECT = "Enter subject here.";
 			
 			var _isAreaExpanded = [false, false, true];
 			
-			var _ExperimentSearchTimer = 0;
-			var _activeExperiment = "";
-			var _experimentsShowArray, _experimentsArray;
+			var _CategorySearchTimer = 0;
+			var _activeCategory = "";
+			var _categorysShowArray, _categorysArray;
 						
 			//preload loader spinner gif
 			var _loaderImage = new Image();			
@@ -429,6 +429,8 @@
 			var _mostRecentDayIndex = -1;
 			var _logbookUpdateTimer = 0;
 			var _REFRESH_INTERVAL = 10000; //10 seconds
+
+			var _TIMEZONE_OFFSET_HOURS = (new Date().getTimezoneOffset())/60;
 				
 			/////////////////////////////////////////////////////////////////////////////////////////
 			/////////////////////////////////////////////////////////////////////////////////////////
@@ -445,8 +447,8 @@
 				
 				_adminStatusEl = document.getElementById('adminStatusDiv');
 				
-				//get active experiment from url
-				setActiveExperiment(DesktopContent.getParameter(1));
+				//get active category from url
+				setActiveCategory(DesktopContent.getParameter(1));
 
 				window.onresize = redrawLogbook;
 				newPostText.value = _DEFAULT_ENTRY_INPUT_TEXT; //init text input
@@ -461,21 +463,21 @@
 						"/WebPath/images/windowContentImages/logbook-expand.png";
 				}
 
-				DesktopContent.XMLHttpRequest("Request?RequestType=GetExperimentList", 		//update experiment list 
-						"", handleGetExperimentListRequest);					
+				DesktopContent.XMLHttpRequest("Request?RequestType=GetCategoryList", 		//update category list 
+						"", handleGetCategoryListRequest);					
 			} //end init()
 
 			//=====================================================================================
-			//setActiveExperiment ~
-			function setActiveExperiment(experiment) 
+			//setActiveCategory ~
+			function setActiveCategory(category) 
 			{					
-			    Debug.log("Logbook setActiveExperiment to " + experiment);
-				_activeExperiment = experiment;
-				if(!_activeExperiment || _activeExperiment == "")
-				{	_activeExperiment = ""; currentExperimentHeader.innerHTML = "No Active Experiment Set"; 	}
+			    Debug.log("Logbook setActiveCategory to " + category);
+				_activeCategory = category;
+				if(!_activeCategory || _activeCategory == "")
+				{	_activeCategory = ""; currentCategoryHeader.innerHTML = "No Active Category Set"; 	}
 				else
-					currentExperimentHeader.innerHTML = "<font color='white'>Active Experiment is</font> " + _activeExperiment;
-			} //end setActiveExperiment()
+					currentCategoryHeader.innerHTML = "<font color='white'>Active Category is</font> " + _activeCategory;
+			} //end setActiveCategory()
 			
 			//=====================================================================================
 			//redrawLogbook ~
@@ -667,6 +669,7 @@
 			         .replace(/%22/g, "&quot;")				//"
 			         .replace(/%27/g, "&#039;")				//'
 			         .replace(/%0A%0D/g, "<br>")			//newline
+					 .replace(/&#010;/g, "<br>")			//newline
 			         .replace(/%20%20/g, "&nbsp;&nbsp;");	//space        
 			} //end convertForClient()
 			
@@ -745,12 +748,12 @@
 			} //end uploadCanceled()		
 
 			//=====================================================================================
-			//handleExperimentInputKeyDown ~~ 
+			//handleCategoryInputKeyDown ~~ 
 			//	allow alphanumeric character only
 			//	if allowSpace is set, then spaces also allowed
-			function handleExperimentInputKeyDown(e, allowSpace) 
+			function handleCategoryInputKeyDown(e, allowSpace) 
 			{	
-				//Debug.log("Logbook handleExperimentInputKeyDown " + e.keyCode);
+				//Debug.log("Logbook handleCategoryInputKeyDown " + e.keyCode);
 				if(e.key == "Tab") return true;		//if tab focus on next box
 				else if((!e.shiftKey && (e.keyCode >= 48 && e.keyCode <= 57)) || //accept numbers but not shifted numbers
 					(e.keyCode >= 96 && e.keyCode <= 105) ||	//accept keypad numbers
@@ -763,7 +766,7 @@
 					return true;
 				
 				return false; //to stop tab and enter (and unaccepted chars) from propagating to window
-			} //end handleExperimentInputKeyDown()
+			} //end handleCategoryInputKeyDown()
 
 			//=====================================================================================
 			//handleSearchKeyUp ~~ 
@@ -771,150 +774,150 @@
 			function handleSearchKeyUp()
 			{				
 
-				var el = document.getElementById("experimentTextBox");	
-				if(el.value.length > _MAX_EXPERIMENT_NAME_LENGTH)
+				var el = document.getElementById("categoryTextBox");	
+				if(el.value.length > _MAX_CATEGORY_NAME_LENGTH)
 				{
-					el.value = el.value.substr(0,_MAX_EXPERIMENT_NAME_LENGTH);
-					_adminStatusEl.innerHTML = "Max experiment name length is " + _MAX_EXPERIMENT_NAME_LENGTH + ".";
+					el.value = el.value.substr(0,_MAX_CATEGORY_NAME_LENGTH);
+					_adminStatusEl.innerHTML = "Max category name length is " + _MAX_CATEGORY_NAME_LENGTH + ".";
 				}
 				
-				el = document.getElementById("experimentList");
+				el = document.getElementById("categoryList");
 				if(el && el.innerHTML.indexOf("loaderGif") == -1)
 					el.innerHTML = "<img id='loaderGif' src='" + _loaderImagePath + "'>";
 					
-				if(_ExperimentSearchTimer) clearTimeout(_ExperimentSearchTimer);
-				_ExperimentSearchTimer = setTimeout(handleTimeoutSearchKeyUp,500);				
+				if(_CategorySearchTimer) clearTimeout(_CategorySearchTimer);
+				_CategorySearchTimer = setTimeout(handleTimeoutSearchKeyUp,500);				
 			} //end handleSearchKeyUp()
 
 			//=====================================================================================
 			//handleTimeoutSearchKeyUp ~~ 
 			function handleTimeoutSearchKeyUp() 
 			{			
-				var el = document.getElementById("experimentTextBox");				
+				var el = document.getElementById("categoryTextBox");				
 				Debug.log("Logbook handleTimeoutSearchKeyUp " + el.value);
-				applyExperimentsSearch(el.value);
-				displayExperiments();
+				applyCategoriesSearch(el.value);
+				displayCategories();
 			} //end handleTimeoutSearchKeyUp()
 			
 			//=====================================================================================
-			//createExperiment ~~ 
-			function createExperiment() 
+			//createCategory ~~ 
+			function createCategory() 
 			{	
-				var el = document.getElementById("experimentTextBox");				
-				Debug.log("Logbook createExperiment " + el.value);
+				var el = document.getElementById("categoryTextBox");				
+				Debug.log("Logbook createCategory " + el.value);
 				
-				DesktopContent.XMLHttpRequest("Request?RequestType=CreateExperiment", 
-						"Experiment="+el.value, handleExperimentChangeRequest);	
-			} //end createExperiment()
+				DesktopContent.XMLHttpRequest("Request?RequestType=CreateCategory", 
+						"Category="+el.value, handleCategoryChangeRequest);	
+			} //end createCategory()
 			
 			//=====================================================================================
-			//removeExperiment ~~ 
-			function removeExperiment() 
+			//removeCategory ~~ 
+			function removeCategory() 
 			{	
-				var el = document.getElementById("experimentTextBox");				
-				Debug.log("Logbook removeExperiment " + el.value);
+				var el = document.getElementById("categoryTextBox");				
+				Debug.log("Logbook removeCategory " + el.value);
 
-				DesktopContent.XMLHttpRequest("Request?RequestType=RemoveExperiment", 
-						"Experiment="+el.value, handleExperimentChangeRequest);				
-			} //end removeExperiment()
+				DesktopContent.XMLHttpRequest("Request?RequestType=RemoveCategory", 
+						"Category="+el.value, handleCategoryChangeRequest);				
+			} //end removeCategory()
 
 			//=====================================================================================
-			//handleExperimentChangeRequest ~~ 
-			function handleExperimentChangeRequest(req) 
+			//handleCategoryChangeRequest ~~ 
+			function handleCategoryChangeRequest(req) 
 			{							
 				_adminStatusEl.innerHTML = DesktopContent.getXMLValue(req,"logbook_admin_status");				
 
-				DesktopContent.XMLHttpRequest("Request?RequestType=GetExperimentList", 		//update experiment list 
-						"", handleGetExperimentListRequest);
-			} //end handleExperimentChangeRequest()
+				DesktopContent.XMLHttpRequest("Request?RequestType=GetCategoryList", 		//update category list 
+						"", handleGetCategoryListRequest);
+			} //end handleCategoryChangeRequest()
 
 			//=====================================================================================
-			//handleGetExperimentListRequest ~~ 
-			function handleGetExperimentListRequest(req) 
+			//handleGetCategoryListRequest ~~ 
+			function handleGetCategoryListRequest(req) 
 			{
 				_isAdmin = DesktopContent.getXMLValue(req,"is_admin")=="1"?1:0;
 
 				if(_isAdmin) 
 				{				
-					//reset active experiment, in case request was a setActiveExperiment request
-					setActiveExperiment(DesktopContent.getXMLValue(req,"active_experiment")); 
+					//reset active category, in case request was a setActiveCategory request
+					setActiveCategory(DesktopContent.getXMLValue(req,"active_category")); 
 					
-					_experimentsArray = req.responseXML.getElementsByTagName("experiment");
-					_experimentsShowArray = new Array(); //init all elements to show
-					for(var i=0;i<_experimentsArray.length;++i) _experimentsShowArray[i] = 1;
+					_categorysArray = req.responseXML.getElementsByTagName("category");
+					_categorysShowArray = new Array(); //init all elements to show
+					for(var i=0;i<_categorysArray.length;++i) _categorysShowArray[i] = 1;
 					
-					displayExperiments();
+					displayCategories();
 				}				
 
 				redrawLogbook(); //setup window divs based on admin	
 				refreshLogbook(); //refresh logbook, by default start with today for one day
 								//NOTE: call refresh logbook here so that _isAdmin is gauranteed to be set
-			} //end handleGetExperimentListRequest()
+			} //end handleGetCategoryListRequest()
 
 			//=====================================================================================
-			//applyExperimentsSearch ~~
-			//	filter _experimentsArray based on needle
-			function applyExperimentsSearch(needle) 
+			//applyCategoriesSearch ~~
+			//	filter _categorysArray based on needle
+			function applyCategoriesSearch(needle) 
 			{
-				for(var i=0;i<_experimentsArray.length;++i) _experimentsShowArray[i] = 1; //reset show array
+				for(var i=0;i<_categorysArray.length;++i) _categorysShowArray[i] = 1; //reset show array
 				if(needle == "") return;
-				Debug.log("Logbook applyExperimentsSearch needle " + needle);	
+				Debug.log("Logbook applyCategoriesSearch needle " + needle);	
 
-				for(var i=0;i<_experimentsArray.length;++i)
-					if(_experimentsArray[i].getAttribute('value').indexOf(needle) == -1)
-						_experimentsShowArray[i] = 0;		//no needle, so hide		
-			} //end applyExperimentsSearch()
+				for(var i=0;i<_categorysArray.length;++i)
+					if(_categorysArray[i].getAttribute('value').indexOf(needle) == -1)
+						_categorysShowArray[i] = 0;		//no needle, so hide		
+			} //end applyCategoriesSearch()
 			
 			//=====================================================================================
-			//displayExperiments ~~ 
+			//displayCategories ~~ 
 			//	diplay in reverse so newest at top
-			function displayExperiments() 
+			function displayCategories() 
 			{
-				Debug.log("Logbook displayExperiments _experimentsArray.length " + _experimentsArray.length);	
-				var el = document.getElementById("experimentList");
+				Debug.log("Logbook displayCategories _categorysArray.length " + _categorysArray.length);	
+				var el = document.getElementById("categoryList");
 				
 				var str = "";
 				var atLeastOne = false;
-				for(var i=_experimentsArray.length-1;i >= 0;--i)
-					if(!_experimentsShowArray[i]) continue;
+				for(var i=_categorysArray.length-1;i >= 0;--i)
+					if(!_categorysShowArray[i]) continue;
 					else {
-						str += "<a href='Javascript:activeExperimentSetRequest(\""+ 
-							_experimentsArray[i].getAttribute('value') + "\")' title='Left-click to make " + 
-							_experimentsArray[i].getAttribute('value') +
-							" the active experiment'>" + 
-							_experimentsArray[i].getAttribute('value') + "</a><br>";
+						str += "<a href='Javascript:activeCategorySetRequest(\""+ 
+							_categorysArray[i].getAttribute('value') + "\")' title='Left-click to make " + 
+							_categorysArray[i].getAttribute('value') +
+							" the active category'>" + 
+							_categorysArray[i].getAttribute('value') + "</a><br>";
 						atLeastOne = true;
 					}
 				
 				if(atLeastOne)
 					el.innerHTML = str;
 				else
-					el.innerHTML = "No matching experiment found.";
-			} //end displayExperiments()
+					el.innerHTML = "No matching category found.";
+			} //end displayCategories()
 			
 			//=====================================================================================
-			//activeExperimentSetRequest ~~ 
-			function activeExperimentSetRequest(experiment) 
+			//activeCategorySetRequest ~~ 
+			function activeCategorySetRequest(category) 
 			{
-				Debug.log("Logbook activeExperimentSetRequest experiment " + experiment);
-				DesktopContent.XMLHttpRequest("Request?RequestType=SetActiveExperiment", 		//update experiment list 
-						"Experiment="+experiment, handleExperimentChangeRequest);
+				Debug.log("Logbook activeCategorySetRequest category " + category);
+				DesktopContent.XMLHttpRequest("Request?RequestType=SetActiveCategory", 		//update category list 
+						"Category="+category, handleCategoryChangeRequest);
 
-				var el = document.getElementById("experimentTextBox");	
-				el.value = experiment;
+				var el = document.getElementById("categoryTextBox");	
+				el.value = category;
 				el.focus();
-			} //end activeExperimentSetRequest()
+			} //end activeCategorySetRequest()
 			
 			//=====================================================================================
-			//clearExperimentInput ~~ 
-			function clearExperimentInput() 
+			//clearCategoryInput ~~ 
+			function clearCategoryInput() 
 			{
-				var el = document.getElementById("experimentTextBox");	
+				var el = document.getElementById("categoryTextBox");	
 				el.value = "";
 				el.focus();
-				applyExperimentsSearch(el.value);
-				displayExperiments();
-			} //end clearExperimentInput()
+				applyCategoriesSearch(el.value);
+				displayCategories();
+			} //end clearCategoryInput()
 
 			//=====================================================================================
 			//refreshLogbook ~~ 
@@ -926,10 +929,10 @@
 			function refreshLogbook(dayIndex,duration) 
 			{
 				Debug.log("Logbook refreshLogbook " + dayIndex + " - " + duration);
-				if(_activeExperiment == "")	{ 
-					Debug.log("Logbook refreshLogbook active experiment not set"); 
+				if(_activeCategory == "")	{ 
+					Debug.log("Logbook refreshLogbook active category not set"); 
 					document.getElementById("logbookDiv").innerHTML = "<div style='color:rgb(255,183,74)'>" + 
-						"Currently there is no active experiment selected. Contact an admin if you think this is an error." + "</div>";
+						"Currently there is no active category selected. Contact an admin if you think this is an error." + "</div>";
 					return; 
 				}
 				
@@ -941,31 +944,13 @@
 				var reqDate = (((((new Date()).getTime())/(1000*60*60*24)) | 0) - _refreshDayIndex)*24*60*60;
 				if(_mostRecentDayIndex < 0) //most recent day request 
 					reqDate = 0; //to indicate get most recent day
-				DesktopContent.XMLHttpRequest("Request?RequestType=RefreshLogbook", 		//update experiment list 
+				DesktopContent.XMLHttpRequest("Request?RequestType=RefreshLogbook", 		//update category list 
 						"Date="+reqDate+"&Duration="+_refreshDuration, 
 						handleRefreshLogbook);				
 				
 				//always show date
-				reqDate = (((((new Date()).getTime())/(1000*60*60*24)) | 0) - _refreshDayIndex)*24*60*60; //in seconds
-				var dateObj = new Date(reqDate*1000); //js date object expects ms
-				var displayDate = (dateObj.getMonth()+1) + "/" + dateObj.getDate() + "/" + dateObj.getFullYear();
-				document.getElementById("logbookCalendarDateDisplay").innerHTML = 
-					"<a href='Javascript:;' onmouseup='refreshLogbook(" + _refreshDayIndex + ");'>(" + 
-					displayDate + ")</a>";	
+				refreshDateDisplay();
 				
-				//decorate selection properly
-				var aArr = document.getElementById("logbookHeader").getElementsByTagName("a");
-				//all of the links in the logbook header (0=today, 1=yesterday,.. 6=max days) max days before might be 6 or 7
-				for(var i=0;i<aArr.length;++i) 
-					if(i < 1 && (reqDate == 0 || _refreshDayIndex == _mostRecentDayIndex))
-						aArr[i].setAttribute("class", "logbookSelection");
-					else if(i == 1 && !(reqDate == 0 || _refreshDayIndex == _mostRecentDayIndex))
-						aArr[i].setAttribute("class", "logbookSelection");
-					else if(i > 1 && i < 8 && aArr[i].innerHTML == _refreshDuration) //durations
-						aArr[i].setAttribute("class", "logbookSelection");
-					else
-						aArr[i].setAttribute("class", "logbookNotSelected");
-					//Debug.log("Logbook " + i + ":" + aArr[i].innerHTML);
 			} //end refreshLogbook()
 			
 			//=====================================================================================
@@ -974,9 +959,8 @@
 			//	from newest to oldest
 			function handleRefreshLogbook(req) 
 			{
-				Debug.log("Logbook handleRefreshLogbook ");
-		        Debug.log("Request Response Text " + req.responseText + " ---\nXML " + req.responseXML,Debug.LOW_PRIORITY);
-
+				Debug.log("Logbook handleRefreshLogbook", req.responseText.length);
+		        
 		        var logbookStatus;
 				if((logbookStatus = DesktopContent.getXMLValue(req,"logbook_status")) !="1") //failed 
 					document.getElementById("logbookDiv").innerHTML = "<div style='color:rgb(255,183,74)'>" + logbookStatus + "</div>";
@@ -994,10 +978,12 @@
 					//	mostRecentDayEl.innerHTML = "Yesterday";
 					//else
 					//	mostRecentDayEl.innerHTML = "Most Recent Day";
+
+					refreshDateDisplay();
 					
 					//extract logbook display
 					var entries = req.responseXML.getElementsByTagName("logbook_entry");
-					setActiveExperiment(DesktopContent.getXMLValue(req,"active_experiment"));
+					setActiveCategory(DesktopContent.getXMLValue(req,"active_category"));
 
 					var logbookEl = document.getElementById("logbookDiv");
 					logbookEl.innerHTML = "";
@@ -1014,6 +1000,38 @@
 		        																				//currently user must use manual refresh
 			} //end handleRefreshLogbook()
 
+			//=====================================================================================
+			//refreshDateDisplay ~~ 
+			function refreshDateDisplay() 
+			{
+				Debug.log("refreshDateDisplay()",_refreshDayIndex);
+				var reqTime = (new Date()).getTime() - _refreshDayIndex*24*60*60*1000; //in ms
+				var dateObj = new Date(reqTime);
+				
+				// (((((new Date()).getTime() + _TIMEZONE_OFFSET_HOURS*60*60*1000)/
+				// 					(1000*60*60*24)) | 0) - 
+				// 				_refreshDayIndex)*24*60*60; //in seconds
+				// var dateObj = new Date(reqDate*1000); //js date object expects ms
+				var displayDate = (dateObj.getMonth()+1) + "/" + dateObj.getDate() + "/" + dateObj.getFullYear();
+				document.getElementById("logbookCalendarDateDisplay").innerHTML = 
+					"<a href='Javascript:;' onmouseup='refreshLogbook(" + _refreshDayIndex + ");'>(" + 
+					displayDate + ")</a>";	
+				
+				//decorate selection properly
+				var aArr = document.getElementById("logbookHeader").getElementsByTagName("a");
+				//all of the links in the logbook header (0=today, 1=yesterday,.. 6=max days) max days before might be 6 or 7
+				for(var i=0;i<aArr.length;++i) 
+					if(i < 1 && (reqTime == 0 || _refreshDayIndex == _mostRecentDayIndex))
+						aArr[i].setAttribute("class", "logbookSelection");
+					else if(i == 1 && !(reqTime == 0 || _refreshDayIndex == _mostRecentDayIndex))
+						aArr[i].setAttribute("class", "logbookSelection");
+					else if(i > 1 && i < 8 && aArr[i].innerHTML == _refreshDuration) //durations
+						aArr[i].setAttribute("class", "logbookSelection");
+					else
+						aArr[i].setAttribute("class", "logbookNotSelected");
+				//Debug.log("Logbook " + i + ":" + aArr[i].innerHTML);
+			} //end refreshDateDisplay()
+
 			//=====================================================================================
 			//displayLogbookEntry ~~ 
 			//	fields are 
@@ -1023,7 +1041,7 @@
 			//		"logbook_entry_creator"
 			//		"logbook_entry_file" (can be many) (file name is from "preview_index")
 			//  get field with entry.getElementsByTagName(field)[0].getAttribute("value");
-			//	gets images using _activeExperiment in path
+			//	gets images using _activeCategory in path
 			//		"logbook_entry_hidden"
 			//		"logbook_entry_hider"
 			//		"logbook_entry_hidden_time"
@@ -1083,7 +1101,8 @@
                     var sysLogDiv = document.createElement("div");
 				    sysLogDiv.setAttribute("class", "Logbook-sysLogDiv");
 				    sysLogDiv.innerHTML = timeVal.toDateString() + " " + timeVal.toLocaleTimeString() + " -- " +
-                          convertForClient(entry.getElementsByTagName("logbook_entry_text")[0].getAttribute("value"));
+                          convertForClient(
+							entry.getElementsByTagName("logbook_entry_text")[0].getAttribute("value"));
 				    omni.appendChild(sysLogDiv);
 				    divEl.appendChild(omni);			    //add entry to div element  
 				    return;	              
@@ -1149,7 +1168,7 @@
 				    if(entry.getElementsByTagName("preview_index")[0]) //is a preview 
 				    	pathPreface += "previews/" + entryId + "/upload_";
 				    else //regular logbook read
-				    	pathPreface += "logbooks/log_" + _activeExperiment + "/uploads/upload_" + entryId + "_";
+				    	pathPreface += "logbooks/log_" + _activeCategory + "/uploads/upload_" + entryId + "_";
 				    
 				    var urn = DesktopContent._localUrnLid?DesktopContent._localUrnLid:DesktopContent._serverUrnLid;
 					var requestURL = "/urn:xdaq-application:lid="+urn+"/Request?RequestType=LogImage&src=";
@@ -1238,14 +1257,14 @@
 			//calendarHandler ~~
 			//	parameter is days since Jan 1, 1970
 			function calendarHandler(userDate) 
-			{
-				
+			{				
 				var dateObj = new Date(userDate*1000*60*60*24);
 				Debug.log("Logbook calendarHandler userDate " + userDate + " = " + 
 						dateObj.toDateString());
 				
 				//update display with user date
-				var refreshDayIndex = ((((new Date()).getTime())/(1000*60*60*24)) | 0) - userDate + 1;
+				var refreshDayIndex = ((((new Date()).getTime())/(1000*60*60*24)) | 0) - userDate;
+				Debug.logv({refreshDayIndex});
 				var displayDate = (dateObj.getMonth()+1) + "/" + dateObj.getDate() + "/" + dateObj.getFullYear();
 								
 				document.getElementById("logbookCalendarDateDisplay").innerHTML = 
@@ -1259,19 +1278,10 @@
 			//=====================================================================================
 			//advanceByDays ~~
 			//	refresh logbook with new day offset and display next to calendar
-			//	input i is negative back in time
+			//	increasing i is subtracted from _refreshDayIndex to go back in time
 			function advanceByDays(i) 
 			{			
-				refreshLogbook(_refreshDayIndex - i); //positive is back in time
-				
-				Debug.log("Logbook advanceByDays " + _refreshDayIndex + " - " + _refreshDuration);
-				var reqDate = (((((new Date()).getTime())/(1000*60*60*24)) | 0) - _refreshDayIndex + 1)*24*60*60; //in seconds
-				var dateObj = new Date(reqDate*1000); //js date object expects ms
-				var displayDate = (dateObj.getMonth()+1) + "/" + dateObj.getDate() + "/" + dateObj.getFullYear();
-				
-				document.getElementById("logbookCalendarDateDisplay").innerHTML = 
-					"<a href='Javascript:;' onmouseup='refreshLogbook(" + _refreshDayIndex + ");'>(" + 
-					displayDate + ")</a>";				
+				refreshLogbook(_refreshDayIndex - i); //positive is back in time						
 			} //end advanceByDays()
 
 			//=====================================================================================
@@ -1294,15 +1304,15 @@
 			//	opens up separate window to generate reports
 			function generateReport() 
 			{
-				if(!_activeExperiment || _activeExperiment == "")
+				if(!_activeCategory || _activeCategory == "")
 				{
-					alert("Error! There must be an active experiment selected.");
+					alert("Error! There must be an active category selected.");
 					return;
 				}
 					
 				var urn = DesktopContent._localUrnLid?DesktopContent._localUrnLid:DesktopContent._serverUrnLid;
-				var requestURL = "/urn:xdaq-application:lid="+urn+"/Request?RequestType=LogReport&activeExperiment=";				
-				window.open(requestURL + _activeExperiment,	'_blank');	//open in new window
+				var requestURL = "/urn:xdaq-application:lid="+urn+"/Request?RequestType=LogReport&activeCategory=";				
+				window.open(requestURL + _activeCategory,	'_blank');	//open in new window
 			} //end generateReport()
 
 		</script>
@@ -1312,11 +1322,11 @@
 	
 	<body onload='//init() called by DesktopContent.js'>	
 
-	<center><div class='areaContent' id='currentExperimentHeader'></div></center>
+	<center><div class='areaContent' id='currentCategoryHeader'></div></center>
 	<!------------------------------------------------------------------------------>
 	<!------------------------------------------------------------------------------>
 	<div class='area' id='adminArea'>
-		<!-- area where admins control active experiment and create new experiments -->
+		<!-- area where admins control active category and create new categorys -->
 		
 		<table width='100%'>
 			<td width='25px'>
@@ -1340,36 +1350,36 @@
 		<table class='areaContent' width='100%'>
 		<td>
 			<div style='float:left;'>
-				<b>Experiment:</b><br>
-				<input type='text' id='experimentTextBox' spellcheck='false'
+				<b>Category:</b><br>
+				<input type='text' id='categoryTextBox' spellcheck='false'
 					value='' 
-					onkeydown='return handleExperimentInputKeyDown(event)'
+					onkeydown='return handleCategoryInputKeyDown(event)'
 					onkeyup='handleSearchKeyUp()'
 						>
-				<a href='Javascript:clearExperimentInput()' title='Clear Experiment text input'><img
-					id='experimentClearIcon'
+				<a href='Javascript:clearCategoryInput()' title='Clear Category text input'><img
+					id='categoryClearIcon'
 					src='/WebPath/images/windowContentImages/logbook-clear.png'></a>
 				<div style='margin:-5px 0 10px 0;font-size:11px'>(alpha-numeric, dashes, and underscores)</div>
 				<input type='submit' onmouseup=
 					'DesktopContent.popUpVerification(
-						"Are you sure you want to <u><i>Create</i></u> the new experiment, <i><b>REPLACE</b></i>?<br><br>",
-						createExperiment, document.getElementById("experimentTextBox").value);' 
-					value='Create Experiment' title='Create a new experiment, or re-add to list'><br><br>
+						"Are you sure you want to <u><i>Create</i></u> the new category, <i><b>REPLACE</b></i>?<br><br>",
+						createCategory, document.getElementById("categoryTextBox").value);' 
+					value='Create Category' title='Create a new category, or re-add to list'><br><br>
 				<input type='submit' onmouseup=
 					'DesktopContent.popUpVerification(
-					"Are you sure you want to <u><i>Remove</i></u> the experiment, <i><b>REPLACE</b></i>?<br><br>",
-					removeExperiment, document.getElementById("experimentTextBox").value,"#ffddd1");'  
-					value='Remove Experiment'  title='Remove an experiment from list' style='color:red'>
+					"Are you sure you want to <u><i>Remove</i></u> the category, <i><b>REPLACE</b></i>?<br><br>",
+					removeCategory, document.getElementById("categoryTextBox").value,"#ffddd1");'  
+					value='Remove Category'  title='Remove an category from list' style='color:red'>
 				<div id='adminStatusDiv'>Status updates are displayed here.</div> 
 			</div>
 			<div style='float:left;margin-left:20px;text-align:right;'>
-				<b>Click to Set Active Experiment:</b>
-				<div id='experimentList'>
-				<font color='grey'>No experiments in list</font>
+				<b>Click to Set Active Category:</b>
+				<div id='categoryList'>
+				<font color='grey'>No categorys in list</font>
 				</div>
-				<div id='clearActiveExperimentDiv'>
-					<a href='Javascript:activeExperimentSetRequest("")' 
-						title='Click to set no active experiment'>Clear Active Experiment</a>
+				<div id='clearActiveCategoryDiv'>
+					<a href='Javascript:activeCategorySetRequest("")' 
+						title='Click to set no active category'>Clear Active Category</a>
 				</div> 
 			</div>
 		</td>
@@ -1411,7 +1421,7 @@
 				<input type="text" id="newPostSubject" spellcheck="false" size='50'
 					onmouseup='if(this.value == _DEFAULT_ENTRY_INPUT_SUBJECT) this.value = "";'
 	                onfocus='if(this.value == _DEFAULT_ENTRY_INPUT_SUBJECT) this.value = "";'
-					onkeydown="return handleExperimentInputKeyDown(event,true)"> <!-- keep subject alpha-numeric -->
+					onkeydown="return handleCategoryInputKeyDown(event,true)"> <!-- keep subject alpha-numeric -->
 				<br>
                 <textarea id='newPostText' rows="8" cols="50"
                     onmouseup='if(this.value == _DEFAULT_ENTRY_INPUT_TEXT) this.value = "";'
@@ -1450,7 +1460,7 @@
 	<!------------------------------------------------------------------------------>
 	<!------------------------------------------------------------------------------>
 	<div class='area' id='logbookArea'>
-		<!-- area where logbook for active experiment is shown -->	
+		<!-- area where logbook for active category is shown -->	
 		<table width='100%'>
 			<td width='25px'>
 			<div class='expandBtn'>
diff --git a/WebGUI/js/DesktopContent.js b/WebGUI/js/DesktopContent.js
index 2a13df7b..8526b3d1 100755
--- a/WebGUI/js/DesktopContent.js
+++ b/WebGUI/js/DesktopContent.js
@@ -1259,6 +1259,7 @@ DesktopContent.XMLHttpRequest = function(requestURL, data, returnHandler,
 					else
 						requestType = "";
 					errStr = "Request " + requestType + " failed due to insufficient account permissions."; 
+					Debug.err(errStr);
 					
 					if(!doNotOfferSequenceChange && DesktopContent._sequence)
 					{
@@ -1294,17 +1295,17 @@ DesktopContent.XMLHttpRequest = function(requestURL, data, returnHandler,
 								/*noAutoComplete*/ true);
 						
 						return;						
-					}
-					//return;
+					}					
 				}
 				else if(req.responseText == Globals.REQ_USER_LOCKOUT_RESPONSE) 
 				{					
-					errStr = "Request failed because another user has locked ots. Put your mouse over the lock icon at the top of the dashboard to see who.";
-					//return;
+					errStr = "Request failed because another user has locked ots. Put your mouse over the lock icon at the top of the dashboard to see who.";					
+					Debug.err(errStr);
 				}				
 				else if(req.responseText == Globals.REQ_NO_LOGIN_RESPONSE) 
 				{
 					errStr = "Login has expired.";
+					Debug.err(errStr);
 
 					if(ignoreSystemBlock || !DesktopContent._blockSystemCheckMailbox) //make sure system is alive
 					{
@@ -1315,20 +1316,20 @@ DesktopContent.XMLHttpRequest = function(requestURL, data, returnHandler,
 								"windowId":			DesktopContent._theWindowId,
 								"request":  		"needToLogin"
 									},"*");
-						//return;
+					
 					}
 				}
 				else if(req.responseText == Globals.REQ_LOCK_REQUIRED_RESPONSE) 
 				{
 					errStr = "Request failed because the request requires the user to lockout the system. Please take over the lock in the Settings area to proceed.";
+					Debug.err(errStr);
 				}
 				else if(!sequence)
 				{    
-
 					if(!req.responseXML) //invalid XML received 
 					{
 						errStr = "Request response is invalid XML!";
-						//return;
+						Debug.err(errStr);
 					}
 					else
 					{
diff --git a/WebGUI/js/SubsystemLaunch.js b/WebGUI/js/SubsystemLaunch.js
index d28f6492..a2a30512 100755
--- a/WebGUI/js/SubsystemLaunch.js
+++ b/WebGUI/js/SubsystemLaunch.js
@@ -411,7 +411,7 @@ SubsystemLaunch.create = function() {
 					str += "<option selected>Select an FSM action:</option>";
 					str += "<option >Configure</option>";
 					// str += "<option >Start</option>";
-					// str += "<option >Stop</option>";
+					str += "<option >Stop</option>";
 					str += "<option >Halt</option>";
 					str += "</select>";
 
@@ -638,7 +638,7 @@ SubsystemLaunch.create = function() {
 								SubsystemLaunch.subsystems[s].name + "&apos;:</option>";
 							str += "<option >Configure</option>";
 							// str += "<option >Start</option>";
-							// str += "<option >Stop</option>";
+							str += "<option >Stop</option>";
 							str += "<option >Halt</option>";
 							str += "</select>";
 						}
@@ -1858,6 +1858,13 @@ SubsystemLaunch.create = function() {
 	
 						window.clearTimeout(_getStatusTimer);
 						_getStatusTimer = window.setTimeout(getCurrentStatus,5000); //in 5 sec
+
+						SubsystemLaunch.system.error = ""; //clear error for next command response
+						//force state display for user feedback
+						SubsystemLaunch.system.inTransition = true;
+						SubsystemLaunch.system.transition = "Launching " + "Stop";
+						SubsystemLaunch.system.progress = 0;
+						displayStatus();
 	
 						//target plan = Iterator::RESERVED_GEN_PLAN_NAME = "---GENERATED_PLAN---"
 						DesktopContent.XMLHttpRequest("StateMachineXgiHandler?" + 
@@ -1894,6 +1901,13 @@ SubsystemLaunch.create = function() {
 					window.clearTimeout(_getStatusTimer);
 					_getStatusTimer = window.setTimeout(getCurrentStatus,5000); //in 5 sec
 
+					SubsystemLaunch.system.error = ""; //clear error for next command response
+					//force state display for user feedback
+					SubsystemLaunch.system.inTransition = true;
+					SubsystemLaunch.system.transition = "Launching " + "Halt";
+					SubsystemLaunch.system.progress = 0;
+					displayStatus();
+
 					//target plan = Iterator::RESERVED_GEN_PLAN_NAME = "---GENERATED_PLAN---"
 					DesktopContent.XMLHttpRequest("StateMachineXgiHandler?" + 
 							"&StateMachine=iterateHalt", //end get data 
@@ -2007,6 +2021,13 @@ SubsystemLaunch.create = function() {
 			window.clearTimeout(_getStatusTimer);
 			_getStatusTimer = window.setTimeout(getCurrentStatus,5000); //in 5 sec
 
+			SubsystemLaunch.system.error = ""; //clear error for next command response
+			//force state display for user feedback
+			SubsystemLaunch.system.inTransition = true;
+			SubsystemLaunch.system.transition = "Launching " + "Stop";
+			SubsystemLaunch.system.progress = 0;
+			displayStatus();
+
 			DesktopContent.XMLHttpRequest("StateMachineXgiHandler?" + 
 						"&fsmName=" + _fsmName + 
 						"&StateMachine=Stop", //end get data 
diff --git a/otsdaq-utilities/ConfigurationGUI/ConfigurationGUISupervisor.cc b/otsdaq-utilities/ConfigurationGUI/ConfigurationGUISupervisor.cc
index bdbc3148..d09141f2 100644
--- a/otsdaq-utilities/ConfigurationGUI/ConfigurationGUISupervisor.cc
+++ b/otsdaq-utilities/ConfigurationGUI/ConfigurationGUISupervisor.cc
@@ -282,7 +282,7 @@ try
 	{
 		// NOTE: similar to Supervisor version but does not keep active sessions
 		__SUP_COUT_WARN__ << requestType << " command received! " << __E__;
-		__MOUT_WARN__ << requestType << " command received! " << __E__;
+		__COUT_WARN__ << requestType << " command received! " << __E__;
 
 		// now launch
 		__SUP_COUT_INFO__ << "Launching " << requestType << "... " << __E__;
diff --git a/otsdaq-utilities/Console/ConsoleSupervisor.cc b/otsdaq-utilities/Console/ConsoleSupervisor.cc
index f7cadfdb..077f0028 100644
--- a/otsdaq-utilities/Console/ConsoleSupervisor.cc
+++ b/otsdaq-utilities/Console/ConsoleSupervisor.cc
@@ -234,7 +234,7 @@ try
 	unsigned int c;
 
 	// force a starting message
-	__MOUT__ << "DEBUG messages look like this." << __E__;
+	__COUT__ << "DEBUG messages look like this." << __E__;
 
 	while(1)
 	{
@@ -259,9 +259,9 @@ try
 				i = 200;  // mark so things are good for all time. (this indicates things
 				          // are configured to be sent here)
 
-				__MOUT_INFO__ << "INFO messages look like this." << __E__;
-				__MOUT_WARN__ << "WARNING messages look like this." << __E__;
-				__MOUT_ERR__ << "ERROR messages look like this." << __E__;
+				__COUT_INFO__ << "INFO messages look like this." << __E__;
+				__COUT_WARN__ << "WARNING messages look like this." << __E__;
+				__COUT_ERR__ << "ERROR messages look like this." << __E__;
 
 				//				//to debug special packets
 				//				__SS__ << "???";
@@ -400,14 +400,14 @@ try
 			    heartbeatCount % 60 == 59))  // every ~2 min for first 5 messages
 			{
 				++selfGeneratedMessageCount;  // increment internal message count
-				__MOUT__ << "Console is alive and waiting... (if no messages, next "
+				__COUT__ << "Console is alive and waiting... (if no messages, next "
 				            "heartbeat is in two minutes)"
 				         << __E__;
 			}
 			else if(heartbeatCount % (60 * 30) == 59)  // approx every hour
 			{
 				++selfGeneratedMessageCount;  // increment internal message count
-				__MOUT__ << "Console is alive and waiting a long time... (if no "
+				__COUT__ << "Console is alive and waiting a long time... (if no "
 				            "messages, next heartbeat is in one hour)"
 				         << __E__;
 			}
diff --git a/otsdaq-utilities/ECLWriter/ECLConnection.cpp b/otsdaq-utilities/ECLWriter/ECLConnection.cpp
index 5c1d40cf..16bbf833 100644
--- a/otsdaq-utilities/ECLWriter/ECLConnection.cpp
+++ b/otsdaq-utilities/ECLWriter/ECLConnection.cpp
@@ -172,7 +172,7 @@ bool ECLConnection::Get(std::string s, std::string& response)
 		__SS_THROW__;
 	}
 
-	__COUTTV__(responseBuffer);
+	__COUTVS__(2,responseBuffer);
 	response = responseBuffer;
 
 	return true;
diff --git a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
index 14749f03..97ffd05d 100644
--- a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
+++ b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
@@ -30,11 +30,12 @@ using namespace ots;
 #define XML_ADMIN_STATUS "logbook_admin_status"
 #define XML_STATUS "logbook_status"
 #define XML_MOST_RECENT_DAY "most_recent_day"
-#define XML_EXPERIMENTS_ROOT "experiments"
-#define XML_EXPERIMENT "experiment"
-#define XML_ACTIVE_EXPERIMENT "active_experiment"
-#define XML_EXPERIMENT_CREATE "create_time"
-#define XML_EXPERIMENT_CREATOR "creator"
+#define XML_TIMEZONE_OFFSET "timezone_offset_hours"
+#define XML_CATEGORY_ROOT "categories"
+#define XML_CATEGORY "category"
+#define XML_ACTIVE_CATEGORY "active_category"
+#define XML_CATEGORY_CREATE "create_time"
+#define XML_CATEGORY_CREATOR "creator"
 
 #define XML_LOGBOOK_ENTRY "logbook_entry"
 #define XML_LOGBOOK_ENTRY_SUBJECT "logbook_entry_subject"
@@ -73,7 +74,18 @@ try
 	ECLHost_     = __ENV__("ECL_URL");  // e.g. https://dbweb6.fnal.gov:8443/ECL/test_beam
 	ECLPwd_      = __ENV__("ECL_PASSWORD");
 	ECLCategory_ = __ENV__("ECL_CATEGORY");
-	ExperimentName_ = __ENV__("OTS_OWNER") + std::string(" ots");
+	CategoryName_ = __ENV__("OTS_OWNER") + std::string(" ots");
+
+
+	// Determine the timezone offset from UTC time in hours
+    std::time_t now = std::time(0);
+    std::tm* localTime = std::localtime(&now);
+    std::tm* utcTime = std::gmtime(&now);
+    int offsetSeconds = std::difftime(std::mktime(localTime), std::mktime(utcTime));
+	timezoneHourOffset_ = offsetSeconds/60/60;
+
+	__SUP_COUTV__(timezoneHourOffset_);
+
 	
 }  // end init()
 catch(const std::runtime_error& e)
@@ -97,14 +109,14 @@ void ECLSupervisor::destroy(void)
 //==============================================================================
 void ECLSupervisor::defaultPage(xgi::Input* /*in*/, xgi::Output* out)
 {
-	__COUT__ << " active experiment " << ECLCategory_ << std::endl;
+	__COUT__ << " active category " << ECLCategory_ << std::endl;
 	*out << "<!DOCTYPE HTML><html lang='en'><head><title>ots</title>" << ECLSupervisor::getIconHeaderString() <<
 	    // end show ots icon
 	    "</head>"
 		<< "<frameset col='100%' row='100%'><frame "
 	        "src='/WebPath/html/Logbook.html?urn="
 	     << this->getApplicationDescriptor()->getLocalId()
-	     << "&active_experiment=" << ECLCategory_ << "'></frameset></html>";
+	     << "&active_category=" << ECLCategory_ << "'></frameset></html>";
 } //end defaultPage()
 
 //==============================================================================
@@ -144,13 +156,13 @@ void ECLSupervisor::setSupervisorPropertyDefaults()
 	CorePropertySupervisorBase::setSupervisorProperty(
 	    CorePropertySupervisorBase::SUPERVISOR_PROPERTIES.UserPermissionsThreshold,
 	    std::string() +
-	        "*=1 | CreateExperiment=-1 | RemoveExperiment=-1 | GetExperimentListAdmin=-1 "
-	        "| SetActiveExperiment=-1" +
+	        "*=1 | CreateCategory=-1 | RemoveCategory=-1 | GetCategoryListAdmin=-1 "
+	        "| SetActiveCategory=-1" +
 	        " | AdminRemoveRestoreEntry=-1");
 
 	CorePropertySupervisorBase::setSupervisorProperty(
 	    CorePropertySupervisorBase::SUPERVISOR_PROPERTIES.AllowNoLoginRequestTypes,
-	    "RefreshLogbook | GetExperimentList");
+	    "RefreshLogbook | GetCategoryList");
 			
 } //end setSupervisorPropertyDefaults()
 
@@ -166,7 +178,7 @@ void ECLSupervisor::forceSupervisorPropertyValues()
 	    CorePropertySupervisorBase::SUPERVISOR_PROPERTIES.NonXMLRequestTypes,
 	    "LogImage | LogReport");
 	CorePropertySupervisorBase::addSupervisorProperty(CorePropertySupervisorBase::SUPERVISOR_PROPERTIES.RequireUserLockRequestTypes,
-			"CreateExperiment | RemoveExperiment | PreviewEntry | AdminRemoveRestoreEntry");
+			"CreateCategory | RemoveCategory | PreviewEntry | AdminRemoveRestoreEntry");
 } //end forceSupervisorPropertyValues()
 
 //==============================================================================
@@ -180,11 +192,11 @@ void ECLSupervisor::request(const std::string&               requestType,
 {
 	__COUTTV__(requestType);
 
-	// Commands - Note: treat 'Experiment' as ECL Category
-	//	N/A CreateExperiment
-	//	N/A RemoveExperiment
-	//	GetExperimentList
-	//	SetActiveExperiment
+	// Commands - Note: treat 'Category' as ECL Category
+	//	N/A CreateCategory
+	//	N/A RemoveCategory
+	//	GetCategoryList
+	//	SetActiveCategory
 	//	RefreshLogbook
 	//	PreviewEntry
 	//	ApproveEntry
@@ -194,21 +206,21 @@ void ECLSupervisor::request(const std::string&               requestType,
 	// to report to logbook admin status use
 	// xmlOut.addTextElementToData(XML_ADMIN_STATUS,tempStr);
 
-	if(0 && requestType == "CreateExperiment")
+	if(0 && requestType == "CreateCategory")
 	{
-		// check that experiment directory does not exist, and it is not in xml list
-		// create experiment (TODO - could set env variable ECLConnection/$ECL_CATEGORY)
+		// check that category directory does not exist, and it is not in xml list
+		// create category (TODO - could set env variable ECLConnection/$ECL_CATEGORY)
 		// 
 
 		// get creator name
 		std::string creator = userInfo.username_;
 
-		// createExperiment(
-		//     CgiDataUtilities::postData(cgiIn, "Experiment"), creator, &xmlOut);
+		// createCategory(
+		//     CgiDataUtilities::postData(cgiIn, "Category"), creator, &xmlOut);
 
 		__COUT__ << "Created" << std::endl;
 	}
-	else if(0 && requestType == "RemoveExperiment")
+	else if(0 && requestType == "RemoveCategory")
 	{
 		// remove from xml list, but do not remove directory (requires manual delete so
 		// mistakes aren't made)
@@ -216,28 +228,19 @@ void ECLSupervisor::request(const std::string&               requestType,
 
 		// get remover name
 		std::string remover = userInfo.username_;
-		// removeExperiment(
-		//     CgiDataUtilities::postData(cgiIn, "Experiment"), remover, &xmlOut);
+		// removeCategory(
+		//     CgiDataUtilities::postData(cgiIn, "Category"), remover, &xmlOut);
 	}
-	else if(requestType == "GetExperimentList")
+	else if(requestType == "GetCategoryList")
 	{
-		//allow all users to ECL categories:
-		if(0 && userInfo.permissionLevel_ >=
-		   CoreSupervisorBase::getSupervisorPropertyUserPermissionsThreshold(
-		       "GetExperimentListAdmin"))
-		{
-			xmlOut.addTextElementToData("is_admin", "0");  // indicate not an admin
-			return;
-		}
-		// else
-
-		xmlOut.addTextElementToData("is_admin", "1");  // indicate not an admin
-		getExperiments(&xmlOut);
+		//allow all users to ECL categories, but tell GUI not admin since have no access to managing ECL posts directly		
+		xmlOut.addTextElementToData("is_admin", "0");  // indicate not an admin
+		getCategories(&xmlOut);
 	}
-	else if(requestType == "SetActiveExperiment")
+	else if(requestType == "SetActiveCategory")
 	{
-		// check that experiment exists
-		// set active experiment
+		// check that category exists
+		// set active category
 
 		//		if(userPermissions < ADMIN_PERMISSIONS_THRESHOLD)
 		//		{
@@ -245,12 +248,12 @@ void ECLSupervisor::request(const std::string&               requestType,
 		// permissions."); 			goto CLEANUP;
 		//		}
 
-		webUserSetActiveExperiment(CgiDataUtilities::postData(cgiIn, "Experiment"),
+		webUserSetActiveCategory(CgiDataUtilities::postData(cgiIn, "Category"),
 		                           &xmlOut);
 	}
 	else if(requestType == "RefreshLogbook")
 	{
-		// returns logbook for currently active experiment based on date and duration
+		// returns logbook for currently active category based on date and duration
 		// parameters
 
 		std::string Date     = CgiDataUtilities::postData(cgiIn, "Date");
@@ -320,10 +323,10 @@ void ECLSupervisor::request(const std::string&               requestType,
 } //end request()
 
 //==============================================================================
-// getExperiments
-//		if xmlOut, then output experiments to xml
+// getCategories
+//		if xmlOut, then output categories to xml
 //		if out, then output to stream
-void ECLSupervisor::getExperiments(HttpXmlDocument* xmlOut, std::ostringstream* out)
+void ECLSupervisor::getCategories(HttpXmlDocument* xmlOut, std::ostringstream* out)
 {
 	if(ECLUser_ == "" || ECLHost_ == "") //ignore ECL when environment variables are not set
 	{
@@ -377,64 +380,65 @@ void ECLSupervisor::getExperiments(HttpXmlDocument* xmlOut, std::ostringstream*
 	// </category_list>
 
 	while((name = StringMacros::extractXmlField(response, "category", 0, after, &after, 
-		"path", "\"")) != "")
+		"path=", "\"")) != "")
 	{
+		after += std::string("category").size(); //move forward to prepare for next search
 		__COUTTV__(name);		
 		exps.push_back(name);
 	}
 	
-	// // check that experiment listing doesn't already exist
+	// // check that category listing doesn't already exist
 	// HttpXmlDocument expXml;
-	// if(!expXml.loadXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH))
+	// if(!expXml.loadXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH))
 	// {
-	// 	__COUT__ << "Fatal Error - Experiment database." << std::endl;
-	// 	__COUT__ << "Creating empty experiment database." << std::endl;
+	// 	__COUT__ << "Fatal Error - Category database." << std::endl;
+	// 	__COUT__ << "Creating empty category database." << std::endl;
 
-	// 	expXml.addTextElementToData((std::string)XML_EXPERIMENTS_ROOT);
-	// 	expXml.saveXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH);
+	// 	expXml.addTextElementToData((std::string)XML_CATEGORY_ROOT);
+	// 	expXml.saveXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH);
 	// 	return;
 	// }
 
-	// expXml.getAllMatchingValues(XML_EXPERIMENT, exps);
+	// expXml.getAllMatchingValues(XML_CATEGORY, exps);
 
 	if(xmlOut)
-		xmlOut->addTextElementToData(XML_ACTIVE_EXPERIMENT, ECLCategory_);
+		xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, ECLCategory_);
 
-	for(unsigned int i = 0; i < exps.size(); ++i)  // loop experiments
+	for(unsigned int i = 0; i < exps.size(); ++i)  // loop categories
 	{
 		if(xmlOut)
-			xmlOut->addTextElementToData(XML_EXPERIMENT, exps[i]);
+			xmlOut->addTextElementToData(XML_CATEGORY, exps[i]);
 		if(out)
 			*out << exps[i] << std::endl;
 	}
-} //end getExperiments()
+} //end getCategories()
 
 //==============================================================================
-// webUserSetActiveExperiment
-//		if experiment exists, set as active
-//		to clear active experiment set to ""
-void ECLSupervisor::webUserSetActiveExperiment(std::string      experiment,
+// webUserSetActiveCategory
+//		if category exists, set as active
+//		to clear active category set to ""
+void ECLSupervisor::webUserSetActiveCategory(std::string      category,
                                                    HttpXmlDocument* xmlOut)
 {
 	// no check, just set
-	ECLCategory_ = experiment;
+	ECLCategory_ = category;
 	if(xmlOut)
 		xmlOut->addTextElementToData(
 		    XML_ADMIN_STATUS,
-		    "Active category set to " + experiment + " successfully.");
-} //end webUserSetActiveExperiment()
+		    "Active category set to " + category + " successfully.");
+} //end webUserSetActiveCategory()
 
 //==============================================================================
 //	refreshLogbook
-//		returns all the logbook data for active experiment from starting date and back in
+//		returns all the logbook data for active category from starting date and back in
 // time for 			duration total number of days.
 //		e.g. date = today, and duration = 1 returns logbook for today from active
-// experiment 		The entries are returns from oldest to newest
-void ECLSupervisor::refreshLogbook(time_t              date,
-                                       unsigned char       duration,
-                                       HttpXmlDocument*    xmlOut,
-                                       std::ostringstream* out,
-                                       std::string         experiment)
+// category 		The entries are returns from oldest to newest
+void ECLSupervisor::refreshLogbook(	time_t              date,
+									unsigned char       duration,
+									HttpXmlDocument*    xmlOut,
+									std::ostringstream* out,
+									std::string         category)
 {
 	if(ECLUser_ == "" || ECLHost_ == "") //ignore ECL when environment variables are not set
 	{
@@ -442,47 +446,179 @@ void ECLSupervisor::refreshLogbook(time_t              date,
 		__SS_THROW__;
 	}
 
-	if(experiment == "")
-		experiment = ECLCategory_;  // default to active experiment
-	if(xmlOut)
-		xmlOut->addTextElementToData(XML_ACTIVE_EXPERIMENT, experiment);  // for success
+	if(category == "")
+		category = ECLCategory_;  // default to active category
+	if(xmlOut) xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, category);  // for success
 
-	unsigned int baseDay;
+	unsigned int// baseDay, 
+		mostRecentDayIndex = 0;
+	time_t baseTime;
 
 	if(!date)  // if date is 0 take most recent day and update it
-		baseDay = (time(0) / (60 * 60 * 24));
+		baseTime = time(0);// / (60 * 60 * 24);
 	else
-		baseDay = (date / (60 * 60 * 24));
+		baseTime = date;// / (60 * 60 * 24);
 	
-	__COUTTV__(baseDay);
-	__COUTTV__(duration);
-	__COUTTV__(experiment);
-
+	if(1) //test xml_get
+	{
+		std::string response, url = "/E/xml_get?e=" + std::string("2502"); //does not return subject!
+		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
+		eclConn.Get(url,response);
+		__COUTV__(response);
+	}
 	
-	//add all posts that match
+	//add all posts that match date/duration criteria
 	{
-		std::string response, url = "/E/xml_search?l=100&c=" + 
-			StringMacros::encodeURIComponent(experiment); //limit to 100 
+		__COUTTV__(category);	
+		std::string response, url = "/E/xml_search?l=100&c=" + //limit to 100 
+			StringMacros::encodeURIComponent(category);  //category
+			// "&a=" + std::to_string(duration) + "days" + //after
+			// "&b=" + baseTimeTmBuffer; //before
+		
+		//apply date range		
+		{
+			__COUTTV__(baseTime);
+			__COUTTV__((size_t)duration);
+
+			baseTime += 2*(60 * 60 * 24); //before is non-inclusive, after is inclusive
+			std::tm *baseTimeTm = std::localtime(&baseTime); // Convert to local time
+			char baseTimeTmBuffer[256];
+			strftime(baseTimeTmBuffer, sizeof(baseTimeTmBuffer), "%Y-%m-%d", baseTimeTm);
+			__COUTTV__(baseTimeTmBuffer);	
+			url += "&b=" + std::string(baseTimeTmBuffer) + "+00:00:00"; //before
+
+			//now calculate after from duration in days
+			baseTime -= duration * (60 * 60 * 24);  //before is non-inclusive, after is inclusive
+			baseTimeTm = std::localtime(&baseTime); // Convert to local time
+			strftime(baseTimeTmBuffer, sizeof(baseTimeTmBuffer), "%Y-%m-%d", baseTimeTm);
+			__COUTTV__(baseTimeTmBuffer);	
+			url += "&a=" + std::string(baseTimeTmBuffer) + "+00:00:00"; //after			
+		}
 		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
 		eclConn.Get(url,response);
 		__COUTV__(response);
+
+		//example response:
+		// <?xml version="1.0" encoding="UTF-8"?>
+		// <entry_list ids_only="False">
+				
+		// 		<entry 
+		// 			id="2502" 
+		// 			author="mu2e_ots" 
+		// 			category="Global Run" 
+		// 			timestamp="12/05/2024 17:49:53"
+		// 			html="yes"
+		// 			formatted="no"
+		// 			form="default"
+		// 			images="0"
+		// 			files="0">
+		// 				<text>Message: &amp;#010;Run stopped. Run &amp;apos;105214&amp;apos; duration so far of 00:11:57.35 seconds.&amp;#010;&amp;#010;This was a System Generated Log Entry from &amp;apos;Mu2e ot>
+		// 				<text-html><![CDATA[<pre class="html_safe_entry">Message: &#010;Run stopped. Run &apos;105214&apos; duration so far of 00:11:57.35 seconds.&#010;&#010;This was a System Generated Log Entry from &apos;Mu2e>
+		// 				<text-cdata><![CDATA[<pre class="html_safe_entry">Message: &#010;Run stopped. Run &apos;105214&apos; duration so far of 00:11:57.35 seconds.&#010;&#010;This was a System Generated Log Entry from &apos;Mu2>
+		// 		</entry>
+		// 		<entry 
+		// 			id="2501" 
+		// 			author="mu2e_ots" 
+		//		...
+
+		//and result to request is:			
+		//  <XML_LOGBOOK_ENTRY>
+		//		<XML_LOGBOOK_ENTRY_TIME>
+		//		<XML_LOGBOOK_ENTRY_CREATOR>
+		//      <XML_LOGBOOK_ENTRY_SUBJECT>
+		//      <XML_LOGBOOK_ENTRY_TEXT>
+		//      <XML_LOGBOOK_ENTRY_FILE value=fileType0>
+		//      <XML_LOGBOOK_ENTRY_FILE value=fileType1> ...
+		//  </XML_LOGBOOK_ENTRY>
+
+		std::string id, author, category, timestamp, files, images, text;
+		size_t after = 0, before = -1, entryCount = 0;
+		std::tm tm;
+
+		while((id = //StringMacros::extractXmlField(response, "entry", 0, after, &after, 
+			StringMacros::rextractXmlField(response, "entry", 0, before, &before,  //e.g. for reverse order
+			"id=", "\"")) != "")
+		{
+			__COUTTV__(id);		
+			++entryCount;
+
+			after = before;
+
+			author = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
+				"author=", "\"");
+			timestamp = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
+				"timestamp=", "\"");
+			__COUTTV__(author);
+			__COUTTV__(timestamp);	
+			tm = {}; //clear	
+			std::istringstream ss(timestamp);	 
+			ss >> std::get_time(&tm, "%m/%d/%Y %H:%M:%S"); // Parse the string into the tm structure			
+			time_t t = std::mktime(&tm); // Convert tm structure to time_t
+
+			if(!date && t > mostRecentDayIndex)
+				mostRecentDayIndex = t; //track most recent entry
+
+			text = StringMacros::extractXmlField(response, "pre class=\"html_safe_entry\"", 0, after, nullptr, 
+				"", ">");
+			__COUTTV__(text.size());
+			__COUTTV__(text);	
+			category = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
+				"category=", "\"");
+
+			if(xmlOut)
+			{
+				auto entryParent = xmlOut->addTextElementToData(XML_LOGBOOK_ENTRY);
+
+				xmlOut->addTextElementToParent(XML_LOGBOOK_ENTRY_TIME, 
+						std::to_string(t), 
+						entryParent);				
+				xmlOut->addTextElementToParent(XML_LOGBOOK_ENTRY_CREATOR, author, entryParent);				
+				xmlOut->addTextElementToParent(XML_LOGBOOK_ENTRY_TEXT, text, entryParent);
+				xmlOut->addTextElementToParent(XML_LOGBOOK_ENTRY_SUBJECT, category + 
+					" - entry #" + id, entryParent);
+			}
+
+			--before; //move back to prepare for next search
+			// after += std::string("entry").size(); //move forward to prepare for next search
+			
+		} //end primary entry extraction loop
+
+		__COUTV__(entryCount);
 	} //end add all posts that match
 
-	if(xmlOut)
-		xmlOut->addTextElementToData(XML_STATUS, "1");  // for success
-	if(out)
-		*out << __COUT_HDR_FL__ << "Today: " << time(0) / (60 * 60 * 24) << std::endl;
+	if(xmlOut) xmlOut->addTextElementToData(XML_STATUS, "1");  // for success
+	if(out)	*out << __COUT_HDR_FL__ << "Today: " << time(0) / (60 * 60 * 24) << std::endl;
+
+	__COUTTV__(mostRecentDayIndex);
+	__COUTTV__(time(0));
+	__COUTTV__(time(0) - mostRecentDayIndex);
+	__COUTTV__((time(0) - mostRecentDayIndex)/(60 * 60 * 24));
+	for(size_t i=0;i<24;++i)
+		__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60)/(60 * 60 * 24));
+	for(size_t i=0;i<24;++i)
+		__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60 - timezoneHourOffset_*60*60)/(60 * 60 * 24));
+	for(size_t i=0;i<24;++i)
+		__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60 + timezoneHourOffset_*60*60)/(60 * 60 * 24));
+		
+	if(xmlOut && mostRecentDayIndex)
+	{
+		mostRecentDayIndex /= (60 * 60 * 24);
+		__COUTTV__(mostRecentDayIndex);
+		__COUTTV__(time(0) / (60 * 60 * 24) - mostRecentDayIndex);
+		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, //0 is today
+					time(0) / (60 * 60 * 24) - mostRecentDayIndex);  // send most recent day index found in response
+	}
+	else 
+		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, 0); //0 is today
 
-	char        dayIndexStr[20];
-	sprintf(dayIndexStr, "%lu", time(0) / (60 * 60 * 24));
-	if(xmlOut)
-		xmlOut->addTextElementToData(XML_MOST_RECENT_DAY,
-		                             dayIndexStr);  // send most recent day index
+	
+	xmlOut->addNumberElementToData(XML_TIMEZONE_OFFSET, timezoneHourOffset_); 
+	
 } //end refreshLogbook()
 
 //==============================================================================
 // xoap::MakeSystemLogEntry
-//	make a system logbook entry into active experiment's logbook from Supervisor only
+//	make a system logbook entry into active category's logbook from Supervisor only
 //	TODO: (how to enforce?)
 xoap::MessageReference ECLSupervisor::MakeSystemLogEntry(xoap::MessageReference msg)
 {
@@ -526,7 +662,7 @@ xoap::MessageReference ECLSupervisor::MakeSystemLogEntry(xoap::MessageReference
 	{
 		std::stringstream ss;
 		ss << "Message: " << __E__ << EntryText << __E__ << __E__;
-		ss << "This was a System Generated Log Entry from '" << ExperimentName_ << "' at host '" << 
+		ss << "This was a System Generated Log Entry from '" << CategoryName_ << "' at host '" << 
 			__ENV__("THIS_HOST") << "'" << __E__;
 		ss << "Active ots users: " << users << __E__;
 		ss << "USER_DATA: " << __ENV__("USER_DATA") << __E__;
@@ -536,22 +672,16 @@ xoap::MessageReference ECLSupervisor::MakeSystemLogEntry(xoap::MessageReference
 		fields.push_back(field);
 	}
 
-	// field = Field_t(EscapeECLString(ExperimentName_), "Experiment");
-	// fields.push_back(field);
-
-	// field = Field_t(EscapeECLString(users), "ActiveUsers");
-	// fields.push_back(field);
-
-	// field = Field_t(EscapeECLString(EntryText), "Entry");
-	// fields.push_back(field);
-
 	form.field(fields);
 	eclEntry.form(form);
 	try
 	{
 		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
 		if(!eclConn.Post(eclEntry))
+		{
+			__COUT_ERR__ << "Failure to post ECL entry." << __E__;
 			retStr = "Failure";
+		}
 	}
 	catch(const std::runtime_error& e)
 	{
diff --git a/otsdaq-utilities/ECLWriter/ECLSupervisor.h b/otsdaq-utilities/ECLWriter/ECLSupervisor.h
index e16e5049..f2797fca 100644
--- a/otsdaq-utilities/ECLWriter/ECLSupervisor.h
+++ b/otsdaq-utilities/ECLWriter/ECLSupervisor.h
@@ -66,8 +66,8 @@ class ECLSupervisor : public CoreSupervisorBase
 
   private:
 
-	void        							getExperiments					(HttpXmlDocument* xmldoc = 0, std::ostringstream* out = 0);
-	void 									webUserSetActiveExperiment		(std::string experiment, HttpXmlDocument* xmldoc = 0);
+	void        							getCategories					(HttpXmlDocument* xmldoc = 0, std::ostringstream* out = 0);
+	void 									webUserSetActiveCategory		(std::string experiment, HttpXmlDocument* xmldoc = 0);
 	void 									refreshLogbook					(time_t              date,
 	     								              						 unsigned char       duration,
 	     								              						 HttpXmlDocument*    xmldoc     = 0,
@@ -78,7 +78,8 @@ class ECLSupervisor : public CoreSupervisorBase
 	std::string                           	ECLHost_;
 	std::string                           	ECLPwd_;
 	std::string                           	ECLCategory_;
-	std::string                           	ExperimentName_;
+	std::string                           	CategoryName_;
+	size_t									timezoneHourOffset_ = 0;
 
 	const std::string						EscapeECLString					(const std::string& input = "");
 };
diff --git a/otsdaq-utilities/Logbook/LogbookSupervisor.cc b/otsdaq-utilities/Logbook/LogbookSupervisor.cc
index 8e9de4fb..8e2c0c8d 100644
--- a/otsdaq-utilities/Logbook/LogbookSupervisor.cc
+++ b/otsdaq-utilities/Logbook/LogbookSupervisor.cc
@@ -18,25 +18,25 @@
 using namespace ots;
 
 const std::string LOGBOOK_PATH = __ENV__("LOGBOOK_DATA_PATH") + std::string("/");
-#define LOGBOOK_EXPERIMENT_LIST_PATH LOGBOOK_PATH + "experiment_list.xml"
-#define LOGBOOK_EXPERIMENT_DIR_PREFACE "log_"
-#define LOGBOOK_UPLOADS_PATH "uploads/"  // within experiment directory
+#define LOGBOOK_CATEGORY_LIST_PATH LOGBOOK_PATH + "category_list.xml"
+#define LOGBOOK_CATEGORY_DIR_PREFACE "log_"
+#define LOGBOOK_UPLOADS_PATH "uploads/"  // within category directory
 #define LOGBOOK_LOGBOOKS_PATH "logbooks/"
 #define LOGBOOK_PREVIEWS_PATH "previews/"
 #define LOGBOOK_FILE_PREFACE "entries_"
 #define LOGBOOK_FILE_EXTENSION ".xml"
 
-#define ACTIVE_EXPERIMENT_PATH LOGBOOK_PATH + "active_experiment.txt"
-#define REMOVE_EXPERIMENT_LOG_PATH LOGBOOK_PATH + "removed_experiments.log"
+#define ACTIVE_CATEGORY_PATH LOGBOOK_PATH + "active_category.txt"
+#define REMOVE_CATEGORY_LOG_PATH LOGBOOK_PATH + "removed_categories.log"
 
 #define XML_ADMIN_STATUS "logbook_admin_status"
 #define XML_STATUS "logbook_status"
 #define XML_MOST_RECENT_DAY "most_recent_day"
-#define XML_EXPERIMENTS_ROOT "experiments"
-#define XML_EXPERIMENT "experiment"
-#define XML_ACTIVE_EXPERIMENT "active_experiment"
-#define XML_EXPERIMENT_CREATE "create_time"
-#define XML_EXPERIMENT_CREATOR "creator"
+#define XML_CATEGORY_ROOT "categories"
+#define XML_CATEGORY "category"
+#define XML_ACTIVE_CATEGORY "active_category"
+#define XML_CATEGORY_CREATE "create_time"
+#define XML_CATEGORY_CREATOR "creator"
 
 #define XML_LOGBOOK_ENTRY "logbook_entry"
 #define XML_LOGBOOK_ENTRY_SUBJECT "logbook_entry_subject"
@@ -59,7 +59,7 @@ XDAQ_INSTANTIATOR_IMPL(LogbookSupervisor)
 
 //==============================================================================
 // sendmail ~~
-//	Helper function to send emails to the subscriber list of the active experiment
+//	Helper function to send emails to the subscriber list of the active category
 int sendmail(const char* to, const char* from, const char* subject, const char* message)
 {
 	int   retval   = -1;
@@ -107,7 +107,7 @@ LogbookSupervisor::LogbookSupervisor(xdaq::ApplicationStub* stub)
 
 	init();
 
-	// TODO allow admins to subscribe to active experiment alerts using System messages
+	// TODO allow admins to subscribe to active category alerts using System messages
 	// (and email)
 }  // end constructor()
 
@@ -158,8 +158,8 @@ void LogbookSupervisor::init(void)
 		}
 	}
 
-	getActiveExperiment();  // init active experiment
-	__COUT__ << "Active Experiment is " << activeExperiment_ << std::endl;
+	getActiveCategory();  // init active category
+	__COUT__ << "Active Category is " << activeCategory_ << std::endl;
 	mostRecentDayIndex_ = 0;
 } //end init()
 
@@ -172,11 +172,11 @@ void LogbookSupervisor::destroy(void)
 //==============================================================================
 void LogbookSupervisor::defaultPage(xgi::Input* /*in*/, xgi::Output* out)
 {
-	__COUT__ << " active experiment " << activeExperiment_ << std::endl;
+	__COUT__ << " active category " << activeCategory_ << std::endl;
 	*out << "<!DOCTYPE HTML><html lang='en'><frameset col='100%' row='100%'><frame "
 	        "src='/WebPath/html/Logbook.html?urn="
 	     << this->getApplicationDescriptor()->getLocalId()
-	     << "&active_experiment=" << activeExperiment_ << "'></frameset></html>";
+	     << "&active_category=" << activeCategory_ << "'></frameset></html>";
 } //end defaultPage()
 
 //==============================================================================
@@ -188,8 +188,8 @@ void LogbookSupervisor::setSupervisorPropertyDefaults()
 	CorePropertySupervisorBase::setSupervisorProperty(
 	    CorePropertySupervisorBase::SUPERVISOR_PROPERTIES.UserPermissionsThreshold,
 	    std::string() +
-	        "*=1 | CreateExperiment=-1 | RemoveExperiment=-1 | GetExperimentListAdmin=-1 "
-	        "| SetActiveExperiment=-1" +
+	        "*=1 | CreateCategory=-1 | RemoveCategory=-1 | GetCategoryListAdmin=-1 "
+	        "| SetActiveCategory=-1" +
 	        " | AdminRemoveRestoreEntry=-1");
 } //end setSupervisorPropertyDefaults()
 
@@ -205,7 +205,7 @@ void LogbookSupervisor::forceSupervisorPropertyValues()
 	    CorePropertySupervisorBase::SUPERVISOR_PROPERTIES.NonXMLRequestTypes,
 	    "LogImage | LogReport");
 	CorePropertySupervisorBase::setSupervisorProperty(CorePropertySupervisorBase::SUPERVISOR_PROPERTIES.RequireUserLockRequestTypes,
-			"CreateExperiment | RemoveExperiment | PreviewEntry | AdminRemoveRestoreEntry");
+			"CreateCategory | RemoveCategory | PreviewEntry | AdminRemoveRestoreEntry");
 } //end forceSupervisorPropertyValues()
 
 //==============================================================================
@@ -220,10 +220,10 @@ void LogbookSupervisor::request(const std::string&               requestType,
 	__COUTTV__(requestType);
 
 	// Commands
-	//	CreateExperiment
-	//	RemoveExperiment
-	//	GetExperimentList
-	//	SetActiveExperiment
+	//	CreateCategory
+	//	RemoveCategory
+	//	GetCategoryList
+	//	SetActiveCategory
 	//	RefreshLogbook
 	//	PreviewEntry
 	//	ApproveEntry
@@ -248,8 +248,8 @@ void LogbookSupervisor::request(const std::string&               requestType,
 	//	{
 	//		bool automaticCommand = requestType == "RefreshLogbook"; //automatic commands
 	// should not refresh cookie code.. only user initiated commands should! 		bool
-	// checkLock = true; 		bool getUser = (requestType == "CreateExperiment") ||
-	//(requestType == "RemoveExperiment") ||
+	// checkLock = true; 		bool getUser = (requestType == "CreateCategory") ||
+	//(requestType == "RemoveCategory") ||
 	//				(requestType == "PreviewEntry") || (requestType ==
 	//"AdminRemoveRestoreEntry"); 		bool requireLock = false;
 	//
@@ -284,12 +284,12 @@ void LogbookSupervisor::request(const std::string&               requestType,
 	// to report to logbook admin status use
 	// xmlOut.addTextElementToData(XML_ADMIN_STATUS,tempStr);
 
-	if(requestType == "CreateExperiment")
+	if(requestType == "CreateCategory")
 	{
-		// check that experiment directory does not exist, and it is not in xml list
-		// create experiment
+		// check that category directory does not exist, and it is not in xml list
+		// create category
 		// create directory
-		// add to experiments list
+		// add to categories list
 		//
 		//		if(userPermissions < ADMIN_PERMISSIONS_THRESHOLD)
 		//		{
@@ -304,12 +304,12 @@ void LogbookSupervisor::request(const std::string&               requestType,
 		// get creator name
 		std::string creator = userInfo.username_;
 
-		createExperiment(
-		    CgiDataUtilities::postData(cgiIn, "Experiment"), creator, &xmlOut);
+		createCategory(
+		    CgiDataUtilities::postData(cgiIn, "Category"), creator, &xmlOut);
 
 		__COUT__ << "Created" << std::endl;
 	}
-	else if(requestType == "RemoveExperiment")
+	else if(requestType == "RemoveCategory")
 	{
 		// remove from xml list, but do not remove directory (requires manual delete so
 		// mistakes aren't made)
@@ -322,16 +322,16 @@ void LogbookSupervisor::request(const std::string&               requestType,
 
 		// get remover name
 		std::string remover = userInfo.username_;
-		removeExperiment(
-		    CgiDataUtilities::postData(cgiIn, "Experiment"), remover, &xmlOut);
+		removeCategory(
+		    CgiDataUtilities::postData(cgiIn, "Category"), remover, &xmlOut);
 	}
-	else if(requestType == "GetExperimentList")
+	else if(requestType == "GetCategoryList")
 	{
 		// remove from xml list, but do not remove directory (requires manual delete so
 		// mistakes aren't made)
 		if(userInfo.permissionLevel_ >=
 		   CoreSupervisorBase::getSupervisorPropertyUserPermissionsThreshold(
-		       "GetExperimentListAdmin"))
+		       "GetCategoryListAdmin"))
 		{
 			xmlOut.addTextElementToData("is_admin", "0");  // indicate not an admin
 			return;
@@ -339,12 +339,12 @@ void LogbookSupervisor::request(const std::string&               requestType,
 		// else
 
 		xmlOut.addTextElementToData("is_admin", "1");  // indicate not an admin
-		getExperiments(&xmlOut);
+		getCategories(&xmlOut);
 	}
-	else if(requestType == "SetActiveExperiment")
+	else if(requestType == "SetActiveCategory")
 	{
-		// check that experiment exists
-		// set active experiment
+		// check that category exists
+		// set active category
 
 		//		if(userPermissions < ADMIN_PERMISSIONS_THRESHOLD)
 		//		{
@@ -352,12 +352,12 @@ void LogbookSupervisor::request(const std::string&               requestType,
 		// permissions."); 			goto CLEANUP;
 		//		}
 
-		webUserSetActiveExperiment(CgiDataUtilities::postData(cgiIn, "Experiment"),
+		webUserSetActiveCategory(CgiDataUtilities::postData(cgiIn, "Category"),
 		                           &xmlOut);
 	}
 	else if(requestType == "RefreshLogbook")
 	{
-		// returns logbook for currently active experiment based on date and duration
+		// returns logbook for currently active category based on date and duration
 		// parameters
 
 		std::string Date     = CgiDataUtilities::postData(cgiIn, "Date");
@@ -451,15 +451,15 @@ void LogbookSupervisor::nonXmlRequest(const std::string& requestType,
 	}
 	else if(requestType == "LogReport")
 	{
-		std::string activeExperiment =
-		    CgiDataUtilities::getData(cgiIn, "activeExperiment");
-		__COUT__ << " Start Log Report for " << activeExperiment << std::endl;
+		std::string activeCategory =
+		    CgiDataUtilities::getData(cgiIn, "activeCategory");
+		__COUT__ << " Start Log Report for " << activeCategory << std::endl;
 
 		out << "<!DOCTYPE HTML><html lang='en'><header><title>ots Logbook "
 		       "Reports</title></header><frameset col='100%' row='100%'><frame "
 		       "src='/WebPath/html/LogbookReport.html?urn="
 		    << this->getApplicationDescriptor()->getLocalId()
-		    << "&activeExperiment=" << activeExperiment << "'></frameset></html>";
+		    << "&activeCategory=" << activeCategory << "'></frameset></html>";
 	}
 	else
 		__COUT__ << "requestType request not recognized." << std::endl;
@@ -467,7 +467,7 @@ void LogbookSupervisor::nonXmlRequest(const std::string& requestType,
 
 //==============================================================================
 // xoap::MakeSystemLogEntry
-//	make a system logbook entry into active experiment's logbook from Supervisor only
+//	make a system logbook entry into active category's logbook from Supervisor only
 //	TODO: (how to enforce?)
 xoap::MessageReference LogbookSupervisor::MakeSystemLogEntry(xoap::MessageReference msg)
 {
@@ -482,13 +482,13 @@ xoap::MessageReference LogbookSupervisor::MakeSystemLogEntry(xoap::MessageRefere
 
 	__COUT__ << "Received External Supervisor System Entry " << EntryText << std::endl;
 	__COUTV__(SubjectText);
-	__COUT__ << "Active Experiment is  " << activeExperiment_ << std::endl;
+	__COUT__ << "Active Category is  " << activeCategory_ << std::endl;
 
 	std::string retStr = "Success";
 
 	std::string logPath,
 	    logDirPath = (std::string)LOGBOOK_PATH + (std::string)LOGBOOK_LOGBOOKS_PATH +
-	                 (std::string)LOGBOOK_EXPERIMENT_DIR_PREFACE + activeExperiment_;
+	                 (std::string)LOGBOOK_CATEGORY_DIR_PREFACE + activeCategory_;
 
 	char                 dayIndexStr[20];
 	HttpXmlDocument      logXml;
@@ -496,10 +496,10 @@ xoap::MessageReference LogbookSupervisor::MakeSystemLogEntry(xoap::MessageRefere
 	xercesc::DOMElement* entryEl;
 	DIR*                 dir;
 
-	if(activeExperiment_ == "")
+	if(activeCategory_ == "")
 	{
 		retStr =
-		    "Warning - Currently, no Active Experiment. Turn off the Logbook XDAQ "
+		    "Warning - Currently, no Active Category. Turn off the Logbook XDAQ "
 		    "Application to suppress this message.";
 		__COUT__ << retStr << std::endl;
 		goto XOAP_CLEANUP;
@@ -509,7 +509,7 @@ xoap::MessageReference LogbookSupervisor::MakeSystemLogEntry(xoap::MessageRefere
 	dir = opendir(logDirPath.c_str());
 	if(!dir)
 	{
-		retStr = "Error - Active Experiment directory missing.";
+		retStr = "Error - Active Category directory missing.";
 		__COUT__ << retStr << std::endl;
 		goto XOAP_CLEANUP;
 	}
@@ -517,7 +517,7 @@ xoap::MessageReference LogbookSupervisor::MakeSystemLogEntry(xoap::MessageRefere
 
 	sprintf(dayIndexStr, "%6.6lu", time(0) / (60 * 60 * 24));  // get today's index
 
-	logPath = logDirPath + "/" + LOGBOOK_FILE_PREFACE + activeExperiment_ + "_" +
+	logPath = logDirPath + "/" + LOGBOOK_FILE_PREFACE + activeCategory_ + "_" +
 	          (std::string)dayIndexStr + LOGBOOK_FILE_EXTENSION;
 	__COUT__ << "logPath " << logPath << std::endl;
 
@@ -576,29 +576,29 @@ xoap::MessageReference LogbookSupervisor::MakeSystemLogEntry(xoap::MessageRefere
 ////LogReport
 ////	Gives controls for generating a logbook report
 ////	NOTE: to create pdf with command line:
-////			paps LogbookData/experiment_list.xml > test.ps
+////			paps LogbookData/category_list.xml > test.ps
 ////			ps2pdfwr test.ps test.pdf
 // void LogbookSupervisor::LogReport(xgi::Input * in, xgi::Output * out )
 // throw (xgi::exception::Exception)
 //{
 //	cgicc::Cgicc cgiIn(in);
-//	std::string activeExperiment = CgiDataUtilities::getData(cgiIn,"activeExperiment");
-//	__COUT__ << " Start Log Report for " << activeExperiment << std::endl;
+//	std::string activeCategory = CgiDataUtilities::getData(cgiIn,"activeCategory");
+//	__COUT__ << " Start Log Report for " << activeCategory << std::endl;
 //	*out << "<!DOCTYPE HTML><html lang='en'><header><title>ots Logbook
 // Reports</title></header><frameset col='100%' row='100%'><frame
 // src='/WebPath/html/LogbookReport.html?urn=" <<
-//			this->getApplicationDescriptor()->getLocalId() << "&activeExperiment=" <<
-// activeExperiment << "'></frameset></html>";
+//			this->getApplicationDescriptor()->getLocalId() << "&activeCategory=" <<
+// activeCategory << "'></frameset></html>";
 //}
 
 //==============================================================================
-// getActiveExperiment
-// 		load active experiment from txt file, must be first line in file
-std::string LogbookSupervisor::getActiveExperiment()
+// getActiveCategory
+// 		load active category from txt file, must be first line in file
+std::string LogbookSupervisor::getActiveCategory()
 {
-	FILE* fp = fopen(std::string((std::string)ACTIVE_EXPERIMENT_PATH).c_str(), "r");
+	FILE* fp = fopen(std::string((std::string)ACTIVE_CATEGORY_PATH).c_str(), "r");
 	if(!fp)
-		activeExperiment_ = "";
+		activeCategory_ = "";
 	else
 	{
 		char line[100];
@@ -613,52 +613,52 @@ std::string LogbookSupervisor::getActiveExperiment()
 		else if(line[strlen(line) - 1] == '\n')
 			line[strlen(line) - 1] = '\0';
 
-		activeExperiment_ = line;
+		activeCategory_ = line;
 	}
 
-	return activeExperiment_;
-} //end getActiveExperiment()
+	return activeCategory_;
+} //end getActiveCategory()
 
 //==============================================================================
-// setActiveExperiment
-//		"" means no experiment is active
-void LogbookSupervisor::setActiveExperiment(std::string experiment)
+// setActiveCategory
+//		"" means no category is active
+void LogbookSupervisor::setActiveCategory(std::string category)
 {
-	FILE* fp = fopen(std::string((std::string)ACTIVE_EXPERIMENT_PATH).c_str(), "w");
+	FILE* fp = fopen(std::string((std::string)ACTIVE_CATEGORY_PATH).c_str(), "w");
 	if(!fp)
 	{
 		__COUT__ << "FATAL ERROR!!! - file write" << std::endl;
 		return;
 	}
 
-	fprintf(fp, "%s", experiment.c_str());
+	fprintf(fp, "%s", category.c_str());
 	fclose(fp);
 
-	if(activeExperiment_ != "" &&
-	   activeExperiment_ != experiment)  // old active experiment is on its way out
+	if(activeCategory_ != "" &&
+	   activeCategory_ != category)  // old active category is on its way out
 		theRemoteWebUsers_.makeSystemLogEntry(
-		    "Experiment was made inactive.");  // make system logbook entry
+		    "Category was made inactive.");  // make system logbook entry
 
 	bool entryNeeded = false;
-	if(experiment != "" &&
-	   activeExperiment_ != experiment)  // old active experiment is on its way out
+	if(category != "" &&
+	   activeCategory_ != category)  // old active category is on its way out
 		entryNeeded = true;
 
-	activeExperiment_ = experiment;
-	__COUT__ << "Active Experiment set to " << activeExperiment_ << std::endl;
+	activeCategory_ = category;
+	__COUT__ << "Active Category set to " << activeCategory_ << std::endl;
 
 	if(entryNeeded)
 		theRemoteWebUsers_.makeSystemLogEntry(
-		    "Experiment was made active.");  // make system logbook entry
-} //end setActiveExperiment()
+		    "Category was made active.");  // make system logbook entry
+} //end setActiveCategory()
 
 //==============================================================================
-// validateExperimentName
+// validateCategoryName
 //		remove all chars that are not alphanumeric, dashes, or underscores
-bool LogbookSupervisor::validateExperimentName(std::string& exp)
+bool LogbookSupervisor::validateCategoryName(std::string& exp)
 {
-	if(exp.length() < EXPERIMENT_NAME_MIN_LENTH ||
-	   exp.length() > EXPERIMENT_NAME_MAX_LENTH)
+	if(exp.length() < CATEGORY_NAME_MIN_LENTH ||
+	   exp.length() > CATEGORY_NAME_MAX_LENTH)
 		return false;
 	for(int i = 0; i < (int)exp.length(); ++i)
 		if(!((exp[i] >= 'a' && exp[i] <= 'z') || (exp[i] >= 'A' && exp[i] <= 'Z') ||
@@ -669,60 +669,60 @@ bool LogbookSupervisor::validateExperimentName(std::string& exp)
 		}  // remove illegal chars and rewind i
 
 	return true;
-} //end validateExperimentName()
+} //end validateCategoryName()
 
 //==============================================================================
-// getExperiments
-//		if xmlOut, then output experiments to xml
+// getCategories
+//		if xmlOut, then output categories to xml
 //		if out, then output to stream
-void LogbookSupervisor::getExperiments(HttpXmlDocument* xmlOut, std::ostringstream* out)
+void LogbookSupervisor::getCategories(HttpXmlDocument* xmlOut, std::ostringstream* out)
 {
-	// check that experiment listing doesn't already exist
+	// check that category listing doesn't already exist
 	HttpXmlDocument expXml;
-	if(!expXml.loadXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH))
+	if(!expXml.loadXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH))
 	{
-		__COUT__ << "Fatal Error - Experiment database." << std::endl;
-		__COUT__ << "Creating empty experiment database." << std::endl;
+		__COUT__ << "Fatal Error - Category database." << std::endl;
+		__COUT__ << "Creating empty category database." << std::endl;
 
-		expXml.addTextElementToData((std::string)XML_EXPERIMENTS_ROOT);
-		expXml.saveXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH);
+		expXml.addTextElementToData((std::string)XML_CATEGORY_ROOT);
+		expXml.saveXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH);
 		return;
 	}
 
 	std::vector<std::string> exps;
-	expXml.getAllMatchingValues(XML_EXPERIMENT, exps);
+	expXml.getAllMatchingValues(XML_CATEGORY, exps);
 
 	if(xmlOut)
-		xmlOut->addTextElementToData(XML_ACTIVE_EXPERIMENT, activeExperiment_);
+		xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, activeCategory_);
 
-	for(unsigned int i = 0; i < exps.size(); ++i)  // loop experiments
+	for(unsigned int i = 0; i < exps.size(); ++i)  // loop categories
 	{
 		if(xmlOut)
-			xmlOut->addTextElementToData(XML_EXPERIMENT, exps[i]);
+			xmlOut->addTextElementToData(XML_CATEGORY, exps[i]);
 		if(out)
 			*out << exps[i] << std::endl;
 	}
-} //end getExperiments()
+} //end getCategories()
 
 //==============================================================================
-// createExperiment
-void LogbookSupervisor::createExperiment(std::string      experiment,
+// createCategory
+void LogbookSupervisor::createCategory(std::string      category,
                                          std::string      creator,
                                          HttpXmlDocument* xmlOut)
 {
-	if(!validateExperimentName(experiment))
+	if(!validateCategoryName(category))
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(
-			    XML_ADMIN_STATUS, "Error - Experiment name must be 3-25 characters.");
+			    XML_ADMIN_STATUS, "Error - Category name must be 3-25 characters.");
 		return;
 	}
 
-	__COUT__ << "experiment " << experiment << std::endl;
+	__COUT__ << "category " << category << std::endl;
 
 	// check that directory doesn't already exist
 	std::string dirPath = (std::string)LOGBOOK_PATH + (std::string)LOGBOOK_LOGBOOKS_PATH +
-	                      (std::string)LOGBOOK_EXPERIMENT_DIR_PREFACE + experiment;
+	                      (std::string)LOGBOOK_CATEGORY_DIR_PREFACE + category;
 
 	__COUT__ << "dirPath " << dirPath << std::endl;
 
@@ -734,43 +734,43 @@ void LogbookSupervisor::createExperiment(std::string      experiment,
 		directoryExists = true;
 	}
 
-	// check that experiment listing doesn't already exist
+	// check that category listing doesn't already exist
 	HttpXmlDocument expXml;
-	if(!expXml.loadXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH))
+	if(!expXml.loadXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH))
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(XML_ADMIN_STATUS,
-			                             "Fatal Error - Experiment database.");
+			                             "Fatal Error - Category database.");
 		return;
 	}
 
 	std::vector<std::string> exps;
-	expXml.getAllMatchingValues(XML_EXPERIMENT, exps);
+	expXml.getAllMatchingValues(XML_CATEGORY, exps);
 
 	for(unsigned int i = 0; i < exps.size(); ++i)
-		if(experiment == exps[i])
+		if(category == exps[i])
 		{
 			if(xmlOut)
 				xmlOut->addTextElementToData(
 				    XML_ADMIN_STATUS,
-				    "Failed - Experiment, " + experiment + ", already exists.");
+				    "Failed - Category, " + category + ", already exists.");
 			return;
 		}
-	__COUT__ << "experiments count: " << exps.size() << std::endl;
+	__COUT__ << "categories count: " << exps.size() << std::endl;
 
-	// everything checks out, add experiment!
-	// add to experiments xml doc and save
-	//	<experiments>
+	// everything checks out, add category!
+	// add to categories xml doc and save
+	//	<categories>
 	//		...
-	//			<experiment_name = "xx">
+	//			<category_name = "xx">
 	//				<create_time = "##"> <who_created = "aa">
 	xercesc::DOMElement* expEl =
-	    expXml.addTextElementToParent(XML_EXPERIMENT, experiment, XML_EXPERIMENTS_ROOT);
+	    expXml.addTextElementToParent(XML_CATEGORY, category, XML_CATEGORY_ROOT);
 	char createTime[20];
 	sprintf(createTime, "%lu", time(0));
-	expXml.addTextElementToParent(XML_EXPERIMENT_CREATE, createTime, expEl);
-	expXml.addTextElementToParent(XML_EXPERIMENT_CREATOR, creator, expEl);
-	expXml.saveXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH);
+	expXml.addTextElementToParent(XML_CATEGORY_CREATE, createTime, expEl);
+	expXml.addTextElementToParent(XML_CATEGORY_CREATOR, creator, expEl);
+	expXml.saveXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH);
 
 	// create directory only if doesn't already exist
 	if(directoryExists)
@@ -781,7 +781,7 @@ void LogbookSupervisor::createExperiment(std::string      experiment,
 
 		directoryExists = false;
 		dir             = opendir(dirPath.c_str());
-		if(!dir)  // check if uploads directory exists within experiment directory
+		if(!dir)  // check if uploads directory exists within category directory
 		{
 			__COUT__ << "Creating uploads directory" << std::endl;
 			if(-1 == mkdir(dirPath.c_str(), 0755))  // make uploads directory
@@ -789,7 +789,7 @@ void LogbookSupervisor::createExperiment(std::string      experiment,
 				if(xmlOut)
 					xmlOut->addTextElementToData(XML_ADMIN_STATUS,
 					                             "Failed - uploads directory for " +
-					                                 experiment + " was not created.");
+					                                 category + " was not created.");
 				__COUT__ << "Uploads directory failure." << std::endl;
 				return;
 			}
@@ -798,121 +798,121 @@ void LogbookSupervisor::createExperiment(std::string      experiment,
 			closedir(dir);
 
 		xmlOut->addTextElementToData(XML_ADMIN_STATUS,
-		                             "Directory already exists for " + experiment +
-		                                 ", re-added to list of experiments.");
+		                             "Directory already exists for " + category +
+		                                 ", re-added to list of categories.");
 		return;
 	}
-	__COUT__ << "Creating experiment and uploads directory at: " << dirPath << std::endl;
+	__COUT__ << "Creating category and uploads directory at: " << dirPath << std::endl;
 	if(-1 == mkdir(dirPath.c_str(), 0755) ||
 	   -1 == mkdir((dirPath + "/" + (std::string)LOGBOOK_UPLOADS_PATH).c_str(), 0755))
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(
 			    XML_ADMIN_STATUS,
-			    "Failed - directory, " + experiment + ", could not be created.");
+			    "Failed - directory, " + category + ", could not be created.");
 		return;
 	}
 
 	if(xmlOut)
 		xmlOut->addTextElementToData(
-		    XML_ADMIN_STATUS, "Experiment, " + experiment + ", successfully created.");
-} //end createExperiment()
+		    XML_ADMIN_STATUS, "Category, " + category + ", successfully created.");
+} //end createCategory()
 
 //==============================================================================
-// webUserSetActiveExperiment
-//		if experiment exists, set as active
-//		to clear active experiment set to ""
-void LogbookSupervisor::webUserSetActiveExperiment(std::string      experiment,
+// webUserSetActiveCategory
+//		if category exists, set as active
+//		to clear active category set to ""
+void LogbookSupervisor::webUserSetActiveCategory(std::string      category,
                                                    HttpXmlDocument* xmlOut)
 {
-	if(experiment == "")  // clear active experiment
+	if(category == "")  // clear active category
 	{
-		setActiveExperiment(experiment);
+		setActiveCategory(category);
 		if(xmlOut)
 			xmlOut->addTextElementToData(XML_ADMIN_STATUS,
-			                             "Active experiment cleared successfully.");
+			                             "Active category cleared successfully.");
 	}
 
-	// check that experiment listing exists
+	// check that category listing exists
 	HttpXmlDocument expXml;
-	if(!expXml.loadXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH))
+	if(!expXml.loadXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH))
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(XML_ADMIN_STATUS,
-			                             "Fatal Error - Experiment database.");
+			                             "Fatal Error - Category database.");
 		return;
 	}
 	std::vector<std::string> exps;
-	expXml.getAllMatchingValues(XML_EXPERIMENT, exps);
+	expXml.getAllMatchingValues(XML_CATEGORY, exps);
 
 	unsigned int i;
 	for(i = 0; i < exps.size(); ++i)
-		if(experiment == exps[i])
+		if(category == exps[i])
 			break;
 
 	if(i == exps.size())  // not found
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(
-			    XML_ADMIN_STATUS, "Failed - Experiment, " + experiment + ", not found.");
+			    XML_ADMIN_STATUS, "Failed - Category, " + category + ", not found.");
 		return;
 	}
 
 	// found!
-	setActiveExperiment(experiment);
+	setActiveCategory(category);
 	if(xmlOut)
 		xmlOut->addTextElementToData(
 		    XML_ADMIN_STATUS,
-		    "Active experiment set to " + experiment + " successfully.");
-} //end webUserSetActiveExperiment()
+		    "Active category set to " + category + " successfully.");
+} //end webUserSetActiveCategory()
 
 //==============================================================================
-// removeExperiment
-//		remove experiment from listing only (do NOT remove logbook data directory)
-//		record remover in log file REMOVE_EXPERIMENT_LOG_PATH
-void LogbookSupervisor::removeExperiment(std::string      experiment,
+// removeCategory
+//		remove category from listing only (do NOT remove logbook data directory)
+//		record remover in log file REMOVE_CATEGORY_LOG_PATH
+void LogbookSupervisor::removeCategory(std::string      category,
                                          std::string      remover,
                                          HttpXmlDocument* xmlOut)
 {
-	__COUT__ << "experiment " << experiment << std::endl;
+	__COUT__ << "category " << category << std::endl;
 
-	// check that experiment listing exists
+	// check that category listing exists
 	HttpXmlDocument expXml;
-	if(!expXml.loadXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH))
+	if(!expXml.loadXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH))
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(XML_ADMIN_STATUS,
-			                             "Fatal Error - Experiment database.");
+			                             "Fatal Error - Category database.");
 		return;
 	}
 	std::vector<std::string> exps;
-	expXml.getAllMatchingValues(XML_EXPERIMENT, exps);
+	expXml.getAllMatchingValues(XML_CATEGORY, exps);
 
 	unsigned int i;
 	for(i = 0; i < exps.size(); ++i)
-		if(experiment == exps[i])
+		if(category == exps[i])
 			break;
 
 	if(i == exps.size())  // not found
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(
-			    XML_ADMIN_STATUS, "Failed - Experiment, " + experiment + ", not found.");
+			    XML_ADMIN_STATUS, "Failed - Category, " + category + ", not found.");
 		return;
 	}
 
 	// found!
 
-	// remove experiment from xml
-	xercesc::DOMElement* parent = expXml.getMatchingElement(XML_EXPERIMENTS_ROOT);
-	xercesc::DOMElement* child  = expXml.getMatchingElement(XML_EXPERIMENT, i);
-	__COUT__ << "experiments original count: " << expXml.getChildrenCount(parent)
+	// remove category from xml
+	xercesc::DOMElement* parent = expXml.getMatchingElement(XML_CATEGORY_ROOT);
+	xercesc::DOMElement* child  = expXml.getMatchingElement(XML_CATEGORY, i);
+	__COUT__ << "categories original count: " << expXml.getChildrenCount(parent)
 	         << std::endl;
 	expXml.recursiveRemoveChild(child, parent);
-	__COUT__ << "experiments new count: " << expXml.getChildrenCount(parent) << std::endl;
+	__COUT__ << "categories new count: " << expXml.getChildrenCount(parent) << std::endl;
 
-	// update removed experiments log
-	FILE* fp = fopen(((std::string)REMOVE_EXPERIMENT_LOG_PATH).c_str(), "a");
+	// update removed categories log
+	FILE* fp = fopen(((std::string)REMOVE_CATEGORY_LOG_PATH).c_str(), "a");
 	if(!fp)
 	{
 		if(xmlOut)
@@ -920,43 +920,43 @@ void LogbookSupervisor::removeExperiment(std::string      experiment,
 		return;
 	}
 	fprintf(fp,
-	        "%s -- %s Experiment removed by %s.\n",
+	        "%s -- %s Category removed by %s.\n",
 	        asctime(localtime(&((time_t const&)(time(0))))),
-	        experiment.c_str(),
+	        category.c_str(),
 	        remover.c_str());
 	fclose(fp);
 
-	expXml.saveXmlDocument((std::string)LOGBOOK_EXPERIMENT_LIST_PATH);  // save database
+	expXml.saveXmlDocument((std::string)LOGBOOK_CATEGORY_LIST_PATH);  // save database
 
-	// unset from activeExperiment_ if is active experiment
-	if(activeExperiment_ == experiment)
-		setActiveExperiment();  // clear active experiment
+	// unset from activeCategory_ if is active category
+	if(activeCategory_ == category)
+		setActiveCategory();  // clear active category
 
 	if(xmlOut)
 		xmlOut->addTextElementToData(
-		    XML_ADMIN_STATUS, "Experiment, " + experiment + ", successfully removed.");
-} //end removeExperiment()
+		    XML_ADMIN_STATUS, "Category, " + category + ", successfully removed.");
+} //end removeCategory()
 
 //==============================================================================
 //	refreshLogbook
-//		returns all the logbook data for active experiment from starting date and back in
+//		returns all the logbook data for active category from starting date and back in
 // time for 			duration total number of days.
 //		e.g. date = today, and duration = 1 returns logbook for today from active
-// experiment 		The entries are returns from oldest to newest
+// category 		The entries are returns from oldest to newest
 void LogbookSupervisor::refreshLogbook(time_t              date,
                                        unsigned char       duration,
                                        HttpXmlDocument*    xmlOut,
                                        std::ostringstream* out,
-                                       std::string         experiment)
+                                       std::string         category)
 {
-	if(experiment == "")
-		experiment = activeExperiment_;  // default to active experiment
+	if(category == "")
+		category = activeCategory_;  // default to active category
 	if(xmlOut)
-		xmlOut->addTextElementToData(XML_ACTIVE_EXPERIMENT, experiment);  // for success
+		xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, category);  // for success
 
 	// check that directory exists
 	std::string dirPath = (std::string)LOGBOOK_PATH + (std::string)LOGBOOK_LOGBOOKS_PATH +
-	                      (std::string)LOGBOOK_EXPERIMENT_DIR_PREFACE + experiment;
+	                      (std::string)LOGBOOK_CATEGORY_DIR_PREFACE + category;
 
 	if(out)
 		*out << __COUT_HDR_FL__ << "dirPath " << dirPath << std::endl;
@@ -967,7 +967,7 @@ void LogbookSupervisor::refreshLogbook(time_t              date,
 		if(xmlOut)
 			xmlOut->addTextElementToData(
 			    XML_STATUS,
-			    "Error - Directory for experiment, " + experiment + ", missing.");
+			    "Error - Directory for category, " + category + ", missing.");
 		if(out)
 			*out << __COUT_HDR_FL__ << "Error - Directory missing" << std::endl;
 		return;
@@ -1038,7 +1038,7 @@ void LogbookSupervisor::refreshLogbook(time_t              date,
 	for(unsigned char i = duration; i != 0; --i)
 	{
 		sprintf(dayIndexStr, "%6.6u", baseDay - i + 1);  // get day index, back in time
-		entryPath = dirPath + "/" + LOGBOOK_FILE_PREFACE + experiment + "_" +
+		entryPath = dirPath + "/" + LOGBOOK_FILE_PREFACE + category + "_" +
 		            (std::string)dayIndexStr + LOGBOOK_FILE_EXTENSION;
 
 		if(out)
@@ -1145,11 +1145,11 @@ void LogbookSupervisor::savePostPreview(std::string&                        subj
                                         std::string                         creator,
                                         HttpXmlDocument*                    xmlOut)
 {
-	if(activeExperiment_ == "")  // no active experiment!
+	if(activeCategory_ == "")  // no active category!
 	{
 		if(xmlOut)
 			xmlOut->addTextElementToData(XML_STATUS,
-			                             "Failed - no active experiment currently!");
+			                             "Failed - no active category currently!");
 		return;
 	}
 
@@ -1279,13 +1279,13 @@ void LogbookSupervisor::movePreviewEntry(std::string previewNumber,
 
 		std::string logPath,
 		    logDirPath = (std::string)LOGBOOK_PATH + (std::string)LOGBOOK_LOGBOOKS_PATH +
-		                 (std::string)LOGBOOK_EXPERIMENT_DIR_PREFACE + activeExperiment_;
+		                 (std::string)LOGBOOK_CATEGORY_DIR_PREFACE + activeCategory_;
 
 		// check that directory exists
 		DIR* dir = opendir(logDirPath.c_str());
 		if(!dir)
 		{
-			__COUT__ << "Error - Active Experiment directory missing: " << logPath
+			__COUT__ << "Error - Active Category directory missing: " << logPath
 			         << std::endl;
 			return;
 		}
@@ -1294,7 +1294,7 @@ void LogbookSupervisor::movePreviewEntry(std::string previewNumber,
 		char dayIndexStr[20];
 		sprintf(dayIndexStr, "%6.6lu", time(0) / (60 * 60 * 24));  // get today's index
 
-		logPath = logDirPath + "/" + LOGBOOK_FILE_PREFACE + activeExperiment_ + "_" +
+		logPath = logDirPath + "/" + LOGBOOK_FILE_PREFACE + activeCategory_ + "_" +
 		          (std::string)dayIndexStr + LOGBOOK_FILE_EXTENSION;
 		__COUT__ << "logPath " << logPath << std::endl;
 
@@ -1373,7 +1373,7 @@ void LogbookSupervisor::escapeLogbookEntry(std::string& /*entry*/)
 //	hideLogbookEntry
 //		NOTE: does not actually delete entry, just marks as hidden
 //      removes/restores logbook entry. Requires admin priveleges
-//		Locates the entry within the active experiment and if hide
+//		Locates the entry within the active category and if hide
 //			appends xml fields:
 //				XML_LOGBOOK_ENTRY_HIDDEN
 //				XML_LOGBOOK_ENTRY_HIDER
@@ -1402,8 +1402,8 @@ void LogbookSupervisor::hideLogbookEntry(const std::string& entryId,
 
 	std::string logDirPath =
 	    (std::string)LOGBOOK_PATH + (std::string)LOGBOOK_LOGBOOKS_PATH +
-	    (std::string)LOGBOOK_EXPERIMENT_DIR_PREFACE + activeExperiment_;
-	std::string logPath = logDirPath + "/" + LOGBOOK_FILE_PREFACE + activeExperiment_ +
+	    (std::string)LOGBOOK_CATEGORY_DIR_PREFACE + activeCategory_;
+	std::string logPath = logDirPath + "/" + LOGBOOK_FILE_PREFACE + activeCategory_ +
 	                      "_" + (std::string)dayIndexStr + LOGBOOK_FILE_EXTENSION;
 
 	__COUT__ << "logPath=" << logPath << std::endl;
diff --git a/otsdaq-utilities/Logbook/LogbookSupervisor.h b/otsdaq-utilities/Logbook/LogbookSupervisor.h
index 3c1dd7c9..11e296f9 100644
--- a/otsdaq-utilities/Logbook/LogbookSupervisor.h
+++ b/otsdaq-utilities/Logbook/LogbookSupervisor.h
@@ -36,22 +36,22 @@ class LogbookSupervisor : public CoreSupervisorBase
 	xoap::MessageReference 				MakeSystemLogEntry				(xoap::MessageReference msg);
 
   private:
-	bool        						validateExperimentName			(std::string& experiment);
-	std::string 						getActiveExperiment				(void);
-	void        						setActiveExperiment				(std::string experiment = "");
-	void        						createExperiment				(std::string      experiment,
+	bool        						validateCategoryName			(std::string& category);
+	std::string 						getActiveCategory				(void);
+	void        						setActiveCategory				(std::string category = "");
+	void        						createCategory					(std::string      category,
 	            						                				 std::string      creator,
 	            						                				 HttpXmlDocument* xmldoc = 0);
-	void        						removeExperiment				(std::string      experiment,
+	void        						removeCategory					(std::string      category,
 	            						                				 std::string      remover,
 	            						                				 HttpXmlDocument* xmldoc = 0);
-	void        						getExperiments					(HttpXmlDocument* xmldoc = 0, std::ostringstream* out = 0);
-	void 								webUserSetActiveExperiment		(std::string experiment, HttpXmlDocument* xmldoc = 0);
+	void        						getCategories					(HttpXmlDocument* xmldoc = 0, std::ostringstream* out = 0);
+	void 								webUserSetActiveCategory		(std::string category, HttpXmlDocument* xmldoc = 0);
 	void 								refreshLogbook					(time_t              date,
 	     								              					 unsigned char       duration,
 	     								              					 HttpXmlDocument*    xmldoc     = 0,
 	     								              					 std::ostringstream* out        = 0,
-	     								              					 std::string         experiment = "");
+	     								              					 std::string         category = "");
 	void 								cleanUpPreviews					(void);
 	void 								savePostPreview					(std::string&                        subject,
 	                    												 std::string&                        text,
@@ -69,14 +69,13 @@ class LogbookSupervisor : public CoreSupervisorBase
 
 	enum
 	{
-		// ADMIN_PERMISSIONS_THRESHOLD     = 255,
-		EXPERIMENT_NAME_MIN_LENTH       = 3,
-		EXPERIMENT_NAME_MAX_LENTH       = 25,
+		CATEGORY_NAME_MIN_LENTH       = 3,
+		CATEGORY_NAME_MAX_LENTH       = 300,
 		LOGBOOK_PREVIEW_EXPIRATION_TIME = 60 * 20,  // 20 minutes
 	};
 	std::vector<std::string> allowedFileUploadTypes_, matchingFileUploadTypes_;
 
-	std::string  activeExperiment_;
+	std::string  activeCategory_;
 	unsigned int mostRecentDayIndex_;
 };
 }  // namespace ots
diff --git a/otsdaq-utilities/MacroMaker/MacroMakerSupervisor.cc b/otsdaq-utilities/MacroMaker/MacroMakerSupervisor.cc
index 49d8a9de..2cda659c 100644
--- a/otsdaq-utilities/MacroMaker/MacroMakerSupervisor.cc
+++ b/otsdaq-utilities/MacroMaker/MacroMakerSupervisor.cc
@@ -683,7 +683,7 @@ void MacroMakerSupervisor::requestWrapper(xgi::Input* in, xgi::Output* out)
 		{
 			__SUP_COUT_ERR__ << "'" << requestType << "' ERROR encountered: " << err
 			                 << __E__;
-			__SUP_MOUT_ERR__ << "'" << requestType << "' ERROR encountered: " << err
+			__SUP_COUT_ERR__ << "'" << requestType << "' ERROR encountered: " << err
 			                 << __E__;
 			err = xmlOut.getMatchingValue("Error", occurance++);
 		}
diff --git a/test/ots_mm_udp_interface.cpp b/test/ots_mm_udp_interface.cpp
index 2e5b52ba..d4625f20 100644
--- a/test/ots_mm_udp_interface.cpp
+++ b/test/ots_mm_udp_interface.cpp
@@ -201,7 +201,7 @@ std::string extractXmlField(const std::string &xml,
 	lo = xml.find("value='", lo) + 7;
 
 	if (returnAfter)
-		*returnAfter = hi + 3; //field.length() + 3;
+		*returnAfter = hi + 3;
 
 	return xml.substr(lo, hi - lo);
 } //end extractXmlField()

From f022bce4c13358785859a1eaf0d5bb3a252be500 Mon Sep 17 00:00:00 2001
From: RYAN A RIVERA <rrivera@FNAL.GOV>
Date: Wed, 18 Dec 2024 13:25:44 -0600
Subject: [PATCH 2/4] Fixed bug in date/timezone handling for ECL

---
 otsdaq-utilities/ECLWriter/ECLConnection.cpp |   8 +-
 otsdaq-utilities/ECLWriter/ECLSupervisor.cc  | 114 ++++++++++++-------
 2 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/otsdaq-utilities/ECLWriter/ECLConnection.cpp b/otsdaq-utilities/ECLWriter/ECLConnection.cpp
index 16bbf833..872b77c6 100644
--- a/otsdaq-utilities/ECLWriter/ECLConnection.cpp
+++ b/otsdaq-utilities/ECLWriter/ECLConnection.cpp
@@ -77,7 +77,7 @@ bool ECLConnection::Get(std::string s, std::string& response)
 		fullURL = _url + s;
 
 	__COUT__ << "ECL GET request to " << fullURL << std::endl;
-	__COUTTV__(needSignature);
+	__COUTVS__(20,needSignature);
 
 
 	std::string xSig;
@@ -97,7 +97,7 @@ bool ECLConnection::Get(std::string s, std::string& response)
 			sprintf(buf, "%02x", resultMD5[i]);
 			xSig.append(buf);
 		}
-		__COUT__ << "ECL MD5 Signature is: " << xSig << std::endl;
+		__COUT_TYPE__(TLVL_DEBUG+20) << __COUT_HDR__ << "ECL MD5 Signature is: " << xSig << std::endl;
 	}
 
 
@@ -150,7 +150,7 @@ bool ECLConnection::Get(std::string s, std::string& response)
 		_safe_url = ""; //clear on error
 		__SS__ << "Error: [" << result << "] - " << errorBuffer << std::endl;
 
-		__COUTT__ << "ECL Cleanup" << std::endl;
+		__COUT_TYPE__(TLVL_DEBUG+20) << __COUT_HDR__ << "ECL Cleanup" << std::endl;
 		// cleanup curl stuff
 		curl_easy_cleanup(curl_handle);
 		// curl_slist_free_all(headers);
@@ -158,7 +158,7 @@ bool ECLConnection::Get(std::string s, std::string& response)
 		__SS_THROW__;
 	}
 	
-	__COUTT__ << "ECL Cleanup" << std::endl;
+	__COUT_TYPE__(TLVL_DEBUG+20) << __COUT_HDR__ << "ECL Cleanup" << std::endl;
 	// cleanup curl stuff
 	curl_easy_cleanup(curl_handle);
 	// curl_slist_free_all(headers);
diff --git a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
index 97ffd05d..81919acb 100644
--- a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
+++ b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
@@ -78,11 +78,22 @@ try
 
 
 	// Determine the timezone offset from UTC time in hours
-    std::time_t now = std::time(0);
-    std::tm* localTime = std::localtime(&now);
-    std::tm* utcTime = std::gmtime(&now);
-    int offsetSeconds = std::difftime(std::mktime(localTime), std::mktime(utcTime));
-	timezoneHourOffset_ = offsetSeconds/60/60;
+    // Get the current time
+    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+
+    // Get the current time in UTC
+    std::chrono::zoned_time<std::chrono::system_clock::duration> utcTime{"UTC", now};
+
+    // Get the current local time using the current system's timezone
+    std::chrono::zoned_time<std::chrono::system_clock::duration> localTime{std::chrono::current_zone(), now};
+
+    // Calculate the difference between local time and UTC
+    std::chrono::seconds offset = std::chrono::duration_cast<std::chrono::seconds>(
+        localTime.get_local_time() - utcTime.get_local_time()
+    );
+
+    // Convert the offset to hours and minutes
+    timezoneHourOffset_ = offset.count() / 3600;
 
 	__SUP_COUTV__(timezoneHourOffset_);
 
@@ -450,16 +461,16 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 		category = ECLCategory_;  // default to active category
 	if(xmlOut) xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, category);  // for success
 
-	unsigned int// baseDay, 
-		mostRecentDayIndex = 0;
+	time_t mostRecentTime = 0;
 	time_t baseTime;
 
+	__COUTTV__(date);
 	if(!date)  // if date is 0 take most recent day and update it
 		baseTime = time(0);// / (60 * 60 * 24);
 	else
-		baseTime = date;// / (60 * 60 * 24);
+		baseTime = date - timezoneHourOffset_*60*60 + 1; //date is 12:00a GMT, so could give wrong day in local timezone
 	
-	if(1) //test xml_get
+	if(0) //test xml_get
 	{
 		std::string response, url = "/E/xml_get?e=" + std::string("2502"); //does not return subject!
 		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
@@ -480,7 +491,32 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 			__COUTTV__(baseTime);
 			__COUTTV__((size_t)duration);
 
-			baseTime += 2*(60 * 60 * 24); //before is non-inclusive, after is inclusive
+			if(TTEST(30)) //debug date
+			{			
+				for(size_t i=0;i<24;++i)
+				{
+					__COUTT__ << "i-: " << i << " " << ((baseTime - i*60*60)/(60 * 60 * 24));
+
+					time_t modTime = baseTime - i*60*60;
+					std::tm *baseTimeTm = std::localtime(&modTime); // Convert to local time
+					char translatedDate[256];
+					strftime(translatedDate, sizeof(translatedDate), "%Y-%m-%d", baseTimeTm);
+					__COUTTV__(translatedDate);	
+				}
+				
+				for(size_t i=0;i<24;++i)
+				{				
+					__COUTT__ << "i+: " << i << " " << ((baseTime + i*60*60)/(60 * 60 * 24));
+					time_t modTime = baseTime + i*60*60;
+					std::tm *baseTimeTm = std::localtime(&modTime); // Convert to local time
+					char translatedDate[256];
+					strftime(translatedDate, sizeof(translatedDate), "%Y-%m-%d", baseTimeTm);
+					__COUTTV__(translatedDate);	
+				}
+			}
+
+			// add one day to calculate before
+			baseTime += 1*(60 * 60 * 24); //before is non-inclusive, after is inclusive
 			std::tm *baseTimeTm = std::localtime(&baseTime); // Convert to local time
 			char baseTimeTmBuffer[256];
 			strftime(baseTimeTmBuffer, sizeof(baseTimeTmBuffer), "%Y-%m-%d", baseTimeTm);
@@ -496,7 +532,7 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 		}
 		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
 		eclConn.Get(url,response);
-		__COUTV__(response);
+		__COUTVS__(3,response);
 
 		//example response:
 		// <?xml version="1.0" encoding="UTF-8"?>
@@ -531,7 +567,7 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 		//      <XML_LOGBOOK_ENTRY_FILE value=fileType1> ...
 		//  </XML_LOGBOOK_ENTRY>
 
-		std::string id, author, category, timestamp, files, images, text;
+		std::string id, author, subject, category, timestamp, files, images, text;
 		size_t after = 0, before = -1, entryCount = 0;
 		std::tm tm;
 
@@ -539,31 +575,34 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 			StringMacros::rextractXmlField(response, "entry", 0, before, &before,  //e.g. for reverse order
 			"id=", "\"")) != "")
 		{
-			__COUTTV__(id);		
+			__COUTVS__(2,id);		
 			++entryCount;
 
 			after = before;
 
 			author = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
 				"author=", "\"");
+			subject = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
+				"subject=", "\"");
+			category = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
+				"category=", "\"");				
 			timestamp = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
 				"timestamp=", "\"");
-			__COUTTV__(author);
-			__COUTTV__(timestamp);	
+
+			__COUTVS__(2,author);
+			__COUTVS__(2,timestamp);	
 			tm = {}; //clear	
 			std::istringstream ss(timestamp);	 
 			ss >> std::get_time(&tm, "%m/%d/%Y %H:%M:%S"); // Parse the string into the tm structure			
 			time_t t = std::mktime(&tm); // Convert tm structure to time_t
 
-			if(!date && t > mostRecentDayIndex)
-				mostRecentDayIndex = t; //track most recent entry
+			if(!date && t > mostRecentTime)
+				mostRecentTime = t; //track most recent entry
 
 			text = StringMacros::extractXmlField(response, "pre class=\"html_safe_entry\"", 0, after, nullptr, 
 				"", ">");
-			__COUTTV__(text.size());
-			__COUTTV__(text);	
-			category = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
-				"category=", "\"");
+			__COUTVS__(2,text.size());
+			__COUTVS__(2,text);	
 
 			if(xmlOut)
 			{
@@ -575,7 +614,7 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 				xmlOut->addTextElementToParent(XML_LOGBOOK_ENTRY_CREATOR, author, entryParent);				
 				xmlOut->addTextElementToParent(XML_LOGBOOK_ENTRY_TEXT, text, entryParent);
 				xmlOut->addTextElementToParent(XML_LOGBOOK_ENTRY_SUBJECT, category + 
-					" - entry #" + id, entryParent);
+					" - entry #" + id + " - " + subject, entryParent);
 			}
 
 			--before; //move back to prepare for next search
@@ -589,24 +628,23 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 	if(xmlOut) xmlOut->addTextElementToData(XML_STATUS, "1");  // for success
 	if(out)	*out << __COUT_HDR_FL__ << "Today: " << time(0) / (60 * 60 * 24) << std::endl;
 
-	__COUTTV__(mostRecentDayIndex);
-	__COUTTV__(time(0));
-	__COUTTV__(time(0) - mostRecentDayIndex);
-	__COUTTV__((time(0) - mostRecentDayIndex)/(60 * 60 * 24));
-	for(size_t i=0;i<24;++i)
-		__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60)/(60 * 60 * 24));
-	for(size_t i=0;i<24;++i)
-		__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60 - timezoneHourOffset_*60*60)/(60 * 60 * 24));
-	for(size_t i=0;i<24;++i)
-		__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60 + timezoneHourOffset_*60*60)/(60 * 60 * 24));
-		
-	if(xmlOut && mostRecentDayIndex)
+	if(TTEST(30))
+	{
+		__COUTTV__(mostRecentTime);
+		__COUTTV__(time(0));
+		__COUTTV__(time(0) - mostRecentTime);
+		__COUTTV__((time(0) - mostRecentTime)/(60 * 60 * 24));
+		__COUTTV__(timezoneHourOffset_);
+		for(size_t i=0;i<24;++i)
+			__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60 + timezoneHourOffset_*60*60)/(60 * 60 * 24));
+	}
+
+	if(xmlOut && mostRecentTime)
 	{
-		mostRecentDayIndex /= (60 * 60 * 24);
-		__COUTTV__(mostRecentDayIndex);
-		__COUTTV__(time(0) / (60 * 60 * 24) - mostRecentDayIndex);
+		__COUTTV__(mostRecentTime);
+		__COUTTV__(((time(0) - mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24)));
 		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, //0 is today
-					time(0) / (60 * 60 * 24) - mostRecentDayIndex);  // send most recent day index found in response
+					((time(0) - mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24)));  // send most recent day index found in response
 	}
 	else 
 		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, 0); //0 is today

From a2443f42b807c59ef90264beb440698a4843d523 Mon Sep 17 00:00:00 2001
From: RYAN A RIVERA <rrivera@FNAL.GOV>
Date: Fri, 20 Dec 2024 16:17:16 -0600
Subject: [PATCH 3/4] Improvements to Chat web app and look and feel of Remote
 Subsystem Squares and Launch

---
 WebGUI/css/SubsystemSquares.css              |  9 +-
 WebGUI/html/Chat.html                        |  7 +-
 WebGUI/html/Logbook.html                     | 44 +++++++++-
 WebGUI/html/MultiSelectBoxTest.html          |  5 +-
 WebGUI/js/SubsystemLaunch.js                 | 44 +++++-----
 WebGUI/js/SubsystemSquares.js                | 53 +++++++++---
 otsdaq-utilities/Chat/ChatSupervisor.cc      |  1 -
 otsdaq-utilities/ECLWriter/ECLConnection.cpp |  9 ++
 otsdaq-utilities/ECLWriter/ECLConnection.h   |  1 +
 otsdaq-utilities/ECLWriter/ECLSupervisor.cc  | 90 +++++++++++++++++---
 otsdaq-utilities/ECLWriter/ECLSupervisor.h   |  4 +
 11 files changed, 203 insertions(+), 64 deletions(-)

diff --git a/WebGUI/css/SubsystemSquares.css b/WebGUI/css/SubsystemSquares.css
index 7ca906e1..8347827b 100755
--- a/WebGUI/css/SubsystemSquares.css
+++ b/WebGUI/css/SubsystemSquares.css
@@ -34,13 +34,13 @@
 		}
 
 		.subsystem_square {
-			background-color: green;
+			background-color:rgb(6 176 6); /* green; */
 			margin: 5px; /* must match _MARGIN/2 in js */
 			float: left;
 			border-radius: 5px;
 			cursor: pointer;
 			overflow-x: auto;
-			overflow-y: hidden;
+			overflow-y: hidden;				
 		}
 		
 		.subsystem_name, .subsystem_console {
@@ -50,14 +50,17 @@
 		.subsystem_name {
 			font-weight: bold;
 			margin-top: 5px;
+			font-size: 20px;
 		}
 		.subsystem_console {
 			white-space: nowrap;
-			font-size: 12px;
+			font-size: 14px;
 		}
 		.subsystem_status {
 			position: relative;			
 			margin-left: 5px;
+    		font-size: 20px;
+			white-space: nowrap;
 		}
 
 		/* ===================== end Subsystem status div section  */
diff --git a/WebGUI/html/Chat.html b/WebGUI/html/Chat.html
index 9a7527a7..51a26d63 100755
--- a/WebGUI/html/Chat.html
+++ b/WebGUI/html/Chat.html
@@ -377,7 +377,8 @@
 			//============================================================
 			//redrawChatWindow ~
 			// 	refreshes chat window, called when window is resized
-			function redrawChatWindow() {			
+			function redrawChatWindow() 
+			{			
 
 			    Debug.log("Chat redrawChat to " + window.innerWidth + " - " + window.innerHeight);
 			    
@@ -725,7 +726,9 @@
 					if(_lastReceivedChat != _chatHistoryArray[0][i].getAttribute('value')) //avoid accidental request duplication (timer conflict)
 					{
 						str += "<div class='chatEntry' style='color:" + getColorForUser(_chatHistoryArray[1][i].getAttribute('value')) + "'>" +
-					 		"<b>(" + formatTime(_chatHistoryArray[2][i].getAttribute('value')) + ") " +
+					 		"<b><label style='width:85px; display:inline-block; font-family:monospace; font-weight:normal;'>(" + 
+								formatTime(_chatHistoryArray[2][i].getAttribute('value')) + 
+							")</label> " +
 						 	_chatHistoryArray[1][i].getAttribute('value') + ":</b> " + 
 						 	convertForClient(_chatHistoryArray[0][i].getAttribute('value')) + "</div>"; //important to only have one /div> per entry for truncate
 						
diff --git a/WebGUI/html/Logbook.html b/WebGUI/html/Logbook.html
index 6a42281b..87c3762a 100755
--- a/WebGUI/html/Logbook.html
+++ b/WebGUI/html/Logbook.html
@@ -179,7 +179,7 @@
 				font-weight: 800;
 			}
 			
-			#logbookHeader a {
+			#logbookHeader a, #currentCategoryHeader a {
 				color: rgb(180, 207, 237);
 				font-weight: 800;
 			}
@@ -357,11 +357,15 @@
 		<script type="text/JavaScript" src="/WebPath/js/DesktopContent.js"></script>
 		<script type="text/JavaScript" src="/WebPath/js/js_lib/CalendarPopup.js"></script>
 		
+		<link rel="stylesheet" type="text/css" href="/WebPath/css/MultiSelectBox.css">
+		<script src="/WebPath/js/js_lib/MultiSelectBox.js"></script>
+		
 		<script>		
 			
 			//functions:			
 				//init()	
 				//setActiveCategory(category)
+				//toggleCategoryFilter()
 				//handleCategoryChangeRequest(req)
 				//handleGetCategoryListRequest(req)
 				//redrawLogbook()
@@ -473,12 +477,46 @@
 			{					
 			    Debug.log("Logbook setActiveCategory to " + category);
 				_activeCategory = category;
+				var str = "";
 				if(!_activeCategory || _activeCategory == "")
-				{	_activeCategory = ""; currentCategoryHeader.innerHTML = "No Active Category Set"; 	}
+				{	_activeCategory = ""; str += "No Active Category Set"; 	}
 				else
-					currentCategoryHeader.innerHTML = "<font color='white'>Active Category is</font> " + _activeCategory;
+					str += "<font color='white'>Active Category is</font> " + _activeCategory;
+
+				str += "<div style='float:right; margin: 3px 8px 0 -350px;'>" +
+					"<a class='logbookNotSelected' href='#' onclick='toggleCategoryFilter()'>" + 
+						"hide/show Categories" + 
+					"</a></div><div id='categoryFilterMultiselect' style='display:none;'></div>";
+
+				currentCategoryHeader.innerHTML = str;
 			} //end setActiveCategory()
 			
+			//=====================================================================================
+			//toggleCategoryFilter ~
+			function toggleCategoryFilter(toggleCategoryFilter) 
+			{					
+			    Debug.log("Logbook toggleCategoryFilter()");
+
+				if(categoryFilterMultiselect.innerHTML == "")
+				{
+					Debug.log("init category multiselect");
+				}
+				else
+				{
+					//toggle dislpay
+					var display = categoryFilterMultiselect.style.display == "none";
+					if(display)
+					{
+						Debug.log("Show");
+					}
+					else
+					{
+						Debug.log("Hide");
+					}
+				}
+
+			} //end toggleCategoryFilter()
+
 			//=====================================================================================
 			//redrawLogbook ~
 			function redrawLogbook() 
diff --git a/WebGUI/html/MultiSelectBoxTest.html b/WebGUI/html/MultiSelectBoxTest.html
index ca579a6c..f4d0768c 100755
--- a/WebGUI/html/MultiSelectBoxTest.html
+++ b/WebGUI/html/MultiSelectBoxTest.html
@@ -14,9 +14,8 @@
 		//THIS IS AN EXAMPLE 
 			//of how to use the library MultiSelectBox.js
 
-		//you can view it in your browser:
-		// e.g. on rulinux03:
-		//http://rulinux03.dhcp.fnal.gov:PORT/WebPath/html/MultiSelectBoxTest.html
+		//e.g., you can view it in your browser on your ots host:
+		//http://HOST.dhcp.fnal.gov:PORT/WebPath/html/MultiSelectBoxTest.html
 
         function init()
         {
diff --git a/WebGUI/js/SubsystemLaunch.js b/WebGUI/js/SubsystemLaunch.js
index a2a30512..f49c8fa4 100755
--- a/WebGUI/js/SubsystemLaunch.js
+++ b/WebGUI/js/SubsystemLaunch.js
@@ -2268,7 +2268,7 @@ SubsystemLaunch.extractSystemStatus = function(req)
 	SubsystemLaunch.system.activeUserCount = DesktopContent.getXMLValue(req,"active_user_count") | 0;
 	SubsystemLaunch.system.activeUserList = DesktopContent.getXMLValue(req,"active_user_list").split(',');
 				
-	SubsystemLaunch.system.lastRunLogEntry = DesktopContent.getXMLValue(req,"last_run_log_entry");
+	SubsystemLaunch.system.lastRunLogEntry = DesktopContent.getXMLValue(req,"last_run_log_entry").substr(0,200); //max length 200
 	if(!SubsystemLaunch.system.lastRunLogEntry || SubsystemLaunch.system.lastRunLogEntry == "")
 	{
 		SubsystemLaunch.system.lastRunLogEntry = "No user entry found";
@@ -2276,68 +2276,64 @@ SubsystemLaunch.extractSystemStatus = function(req)
 			SubsystemLaunch.system.lastRunLogEntry += ", please enter one when starting the the next run.";
 	}
 	else   
-		SubsystemLaunch.system.lastRunLogEntry = decodeURIComponent(SubsystemLaunch.system.lastRunLogEntry);
+		SubsystemLaunch.system.lastRunLogEntry = decodeURIComponent(SubsystemLaunch.system.lastRunLogEntry) + 
+			(SubsystemLaunch.system.lastRunLogEntry.length == 200?"...":"");
 
-	SubsystemLaunch.system.lastLogbookEntry = DesktopContent.getXMLValue(req,"last_logbook_entry");
+	SubsystemLaunch.system.lastLogbookEntry = DesktopContent.getXMLValue(req,"last_logbook_entry").substr(0,200); //max length 200
 	if(SubsystemLaunch.system.lastLogbookEntry == "")
 		SubsystemLaunch.system.lastLogbookEntry = "No logbook entry found.";
 	else
-		SubsystemLaunch.system.lastLogbookEntry += " (" + DesktopContent.getXMLValue(req,"last_logbook_entry_time") + ")";  				
+		SubsystemLaunch.system.lastLogbookEntry += (SubsystemLaunch.system.lastLogbookEntry.length == 200?"... (":" (") + DesktopContent.getXMLValue(req,"last_logbook_entry_time") + ")";  				
 		
-	SubsystemLaunch.system.lastSystemMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_system_message"));
+	SubsystemLaunch.system.lastSystemMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_system_message")).substr(0,200); //max length 200
 	if(SubsystemLaunch.system.lastSystemMessage == "")
 		SubsystemLaunch.system.lastSystemMessage = "No System Message found.";
 	else
-		SubsystemLaunch.system.lastSystemMessage += " (" + DesktopContent.getXMLValue(req,"last_system_message_time") + ")";
+		SubsystemLaunch.system.lastSystemMessage += (SubsystemLaunch.system.lastLogbookEntry.length == 200?"... (":" (") + DesktopContent.getXMLValue(req,"last_system_message_time") + ")";
 	
 	SubsystemLaunch.system.logRolloverMode = decodeURIComponent(DesktopContent.getXMLValue(req,"stateMachineLogRollover"));	
 	
 	SubsystemLaunch.system.consoleErrCount = "Console Err #: " + (DesktopContent.getXMLValue(req,"console_err_count") | 0); 
 	SubsystemLaunch.system.consoleWarnCount = "Console Warn #: " + (DesktopContent.getXMLValue(req,"console_warn_count") | 0); 
 	SubsystemLaunch.system.consoleInfoCount = "Console Info #: " + (DesktopContent.getXMLValue(req,"console_info_count") | 0); 
+	
 
-	SubsystemLaunch.system.consoleErrMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_console_err_msg"));
-	if(SubsystemLaunch.system.consoleErrMessage == "")
-		SubsystemLaunch.system.consoleErrMessage = "No console err message found.";
-	else
-		SubsystemLaunch.system.consoleErrMessage += " " + DesktopContent.getXMLValue(req,"last_console_err_msg_time") + "";  	
-
-	SubsystemLaunch.system.consoleErrMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_console_err_msg"));
+	SubsystemLaunch.system.consoleErrMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_console_err_msg")).substr(0,500); //max length 200
 	if(SubsystemLaunch.system.consoleErrMessage == "")
 		SubsystemLaunch.system.consoleErrMessage = "No console err message found.";
 	else
-		SubsystemLaunch.system.consoleErrMessage += " " + DesktopContent.getXMLValue(req,"last_console_err_msg_time") + ""; 
+		SubsystemLaunch.system.consoleErrMessage += (SubsystemLaunch.system.consoleErrMessage.length == 500?"... ":" ") + DesktopContent.getXMLValue(req,"last_console_err_msg_time") + ""; 
 	
-	SubsystemLaunch.system.consoleWarnMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_console_warn_msg"));
+	SubsystemLaunch.system.consoleWarnMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_console_warn_msg")).substr(0,500); //max length 200
 	if(SubsystemLaunch.system.consoleWarnMessage == "")
 		SubsystemLaunch.system.consoleWarnMessage = "No console err message found.";
 	else
-		SubsystemLaunch.system.consoleWarnMessage += " " + DesktopContent.getXMLValue(req,"last_console_warn_msg_time") + "";  	
+		SubsystemLaunch.system.consoleWarnMessage += (SubsystemLaunch.system.consoleWarnMessage.length == 500?"... ":" ") + DesktopContent.getXMLValue(req,"last_console_warn_msg_time") + "";  	
 
-	SubsystemLaunch.system.consoleInfoMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_console_info_msg"));
+	SubsystemLaunch.system.consoleInfoMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"last_console_info_msg")).substr(0,200); //max length 200
 	if(SubsystemLaunch.system.consoleInfoMessage == "")
 		SubsystemLaunch.system.consoleInfoMessage = "No console err message found.";
 	else
-		SubsystemLaunch.system.consoleInfoMessage += " " + DesktopContent.getXMLValue(req,"last_console_info_msg_time") + "";  	
+		SubsystemLaunch.system.consoleInfoMessage += (SubsystemLaunch.system.consoleInfoMessage.length == 200?"... ":" ") + DesktopContent.getXMLValue(req,"last_console_info_msg_time") + "";  	
 
 		
-	SubsystemLaunch.system.consoleFirstErrMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"first_console_err_msg"));
+	SubsystemLaunch.system.consoleFirstErrMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"first_console_err_msg")).substr(0,200); //max length 200
 	if(SubsystemLaunch.system.consoleFirstErrMessage == "")
 		SubsystemLaunch.system.consoleFirstErrMessage = "No console err message found.";
 	else
-		SubsystemLaunch.system.consoleFirstErrMessage += " " + DesktopContent.getXMLValue(req,"first_console_err_msg_time") + ""; 
+		SubsystemLaunch.system.consoleFirstErrMessage += (SubsystemLaunch.system.consoleFirstErrMessage.length == 200?"... ":" ") + DesktopContent.getXMLValue(req,"first_console_err_msg_time") + ""; 
 	
-	SubsystemLaunch.system.consoleFirstWarnMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"first_console_warn_msg"));
+	SubsystemLaunch.system.consoleFirstWarnMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"first_console_warn_msg")).substr(0,200); //max length 200
 	if(SubsystemLaunch.system.consoleFirstWarnMessage == "")
 		SubsystemLaunch.system.consoleFirstWarnMessage = "No console err message found.";
 	else
-		SubsystemLaunch.system.consoleFirstWarnMessage += " " + DesktopContent.getXMLValue(req,"first_console_warn_msg_time") + "";  	
+		SubsystemLaunch.system.consoleFirstWarnMessage += (SubsystemLaunch.system.consoleFirstWarnMessage.length == 200?"... ":" ") + DesktopContent.getXMLValue(req,"first_console_warn_msg_time") + "";  	
 
-	SubsystemLaunch.system.consoleFirstInfoMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"first_console_info_msg"));
+	SubsystemLaunch.system.consoleFirstInfoMessage = decodeURIComponent(DesktopContent.getXMLValue(req,"first_console_info_msg")).substr(0,200); //max length 200
 	if(SubsystemLaunch.system.consoleFirstInfoMessage == "")
 		SubsystemLaunch.system.consoleFirstInfoMessage = "No console err message found.";
 	else
-		SubsystemLaunch.system.consoleFirstInfoMessage += " " + DesktopContent.getXMLValue(req,"first_console_info_msg_time") + "";  	
+		SubsystemLaunch.system.consoleFirstInfoMessage += (SubsystemLaunch.system.consoleFirstInfoMessage.length == 200?"... ":" ") + DesktopContent.getXMLValue(req,"first_console_info_msg_time") + "";  	
 
 	// Debug.log("system obj", SubsystemLaunch.system);
 
diff --git a/WebGUI/js/SubsystemSquares.js b/WebGUI/js/SubsystemSquares.js
index 1ce1d25d..82bbd85e 100755
--- a/WebGUI/js/SubsystemSquares.js
+++ b/WebGUI/js/SubsystemSquares.js
@@ -259,10 +259,10 @@ SubsystemSquares.create = function() {
 				"' class='subsystem_square'";
 			if(s == -1) //Landing Page link for Primary Gateway				 
 				str += "' onclick='SubsystemSquares.clickedSquare(" + s + ");' " +
-					"title='Click to open the Subsystem Launch GUI.' ";					
+					"title='Click to show errors or open the Subsystem Launch GUI.' ";					
 			else if(SubsystemSquares.subsystems[s])// && SubsystemSquares.subsystems[s].landingPage)
 				str += "' onclick='SubsystemSquares.clickedSquare(" + s + ");' " +
-					"title='Click to open Subsystem Landing Page of &apos;" +
+					"title='Click to show errors or open Subsystem Landing Page of &apos;" +
 					SubsystemSquares.subsystems[s].name + "&apos;' ";
 			str += ">";
 
@@ -358,7 +358,7 @@ SubsystemSquares.create = function() {
 			els[0].style.display = redrawMode?"block":"none";
 			els = sdivs[i].getElementsByClassName("subsystem_status");
 			// els[0].style.display = redrawMode?"block":"none";
-			els[0].style.top = (hhh - 1*_MARGIN - 30) + "px";
+			els[0].style.top = (hhh - 1*_MARGIN - 35) + "px";
 
 		} //end square resize loop
 				
@@ -523,21 +523,33 @@ SubsystemSquares.create = function() {
 						statusString != "Configured" &&  
 						statusString != "Paused" &&  
 						statusString != "Running") //including SubsystemSquares.system.inTransition
-					sdivs[i].style.backgroundColor = "lightgray";
+					sdivs[i].style.background = "lightgray";
+				else if(statusString == "Running")
+					sdivs[i].style.background = "radial-gradient(circle at 50% 120%, rgb(119, 208, 255), rgb(119, 208, 255) 10%, rgb(7, 105, 191) 80%, rgb(6, 39, 69) 100%)";
 				else
-					sdivs[i].style.backgroundColor = "green";
+					sdivs[i].style.background = "rgb(6 176 6)"; //"green";
 
 					
 				if(isRed)
 				{
-					sdivs[i].style.backgroundColor = "darkred";
+					sdivs[i].style.background = "darkred";
 					sdivs[i].style.color = "white";
 					sdivs[i].style.border = "3px solid red";
 					sdivs[i].style.margin = "2px";
+					sdivs[i].style.textShadow = "";
 				}
 				else
 				{
-					sdivs[i].style.color = "black";
+					if(statusString == "Running")
+					{
+						sdivs[i].style.color = "white";
+						sdivs[i].style.textShadow = "1px 1px black";						
+					}
+					{
+						sdivs[i].style.color = "black";
+						sdivs[i].style.textShadow = "";
+					}
+
 					sdivs[i].style.border = "0";
 					sdivs[i].style.margin = "5px";
 				}				
@@ -568,7 +580,8 @@ SubsystemSquares.create = function() {
 					if(secs < 10)	tstr += "0"; //keep to 2 digits
 					tstr += secs;
 						
-					str += " <label style='font-size:12px'>(Time-in-state: " + tstr + ")</label>";
+					str += " <label style='font-size:14px; position: relative;" +
+						"top: -2px;'>(Time-in-state: " + tstr + ")</label>";
 				}
 				els[0].innerHTML = str;
 
@@ -595,22 +608,33 @@ SubsystemSquares.create = function() {
 						statusString != "Configured" &&  
 						statusString != "Paused" &&  
 						statusString != "Running") 
-					sdivs[i].style.backgroundColor = "lightgray";
+					sdivs[i].style.background = "lightgray";
+				else if(statusString == "Running")
+					sdivs[i].style.background = "radial-gradient(circle at 50% 120%, rgb(119, 208, 255), rgb(119, 208, 255) 10%, rgb(7, 105, 191) 80%, rgb(6, 39, 69) 100%)";
 				else
-					sdivs[i].style.backgroundColor = "green";
+					sdivs[i].style.background =  "rgb(6 176 6)"; //"green";
 
 				SubsystemSquares.subsystems[s].isRed = isRed;
 					
 				if(isRed)
 				{
-					sdivs[i].style.backgroundColor = "darkred";
+					sdivs[i].style.background = "darkred";
 					sdivs[i].style.color = "white";
 					sdivs[i].style.border = "3px solid red";
 					sdivs[i].style.margin = "2px";
+					sdivs[i].style.textShadow = "";
 				}
 				else
 				{
-					sdivs[i].style.color = "black";
+					if(statusString == "Running")
+					{
+						sdivs[i].style.color = "white";
+						sdivs[i].style.textShadow = "1px 1px black";						
+					}
+					{
+						sdivs[i].style.color = "black";
+						sdivs[i].style.textShadow = "";
+					}
 					sdivs[i].style.border = "0";
 					sdivs[i].style.margin = "5px";
 				}
@@ -644,11 +668,12 @@ SubsystemSquares.create = function() {
 				els = sdivs[i].getElementsByClassName("subsystem_status");
 				str = ""; //clear
 				if(SubsystemSquares.subsystems[s].redrawMode > 0)
-					str = SubsystemSquares.subsystems[s].status;
+					str = statusString == "Failed"?statusString:SubsystemSquares.subsystems[s].status;
 				if(SubsystemSquares.subsystems[s].progress != "100" && SubsystemSquares.subsystems[s].progress != "0")
 					str += _dotDotDot;
 				if(SubsystemSquares.subsystems[s].redrawMode > 1)
-					str += " <label style='font-size:12px'>(" + SubsystemSquares.subsystems[s].detail + ")</label>";				
+					str += " <label style='font-size:14px; position: relative;" +
+						"top: -2px;'>(" + SubsystemSquares.subsystems[s].detail + ")</label>";				
 				
 				els[0].innerHTML = str;
 
diff --git a/otsdaq-utilities/Chat/ChatSupervisor.cc b/otsdaq-utilities/Chat/ChatSupervisor.cc
index e0eb0347..fae40229 100644
--- a/otsdaq-utilities/Chat/ChatSupervisor.cc
+++ b/otsdaq-utilities/Chat/ChatSupervisor.cc
@@ -17,7 +17,6 @@ XDAQ_INSTANTIATOR_IMPL(ChatSupervisor)
 
 //==============================================================================
 ChatSupervisor::ChatSupervisor(xdaq::ApplicationStub* stub)
-
     : CoreSupervisorBase(stub)
 {
 	INIT_MF("." /*directory used is USER_DATA/LOG/.*/);
diff --git a/otsdaq-utilities/ECLWriter/ECLConnection.cpp b/otsdaq-utilities/ECLWriter/ECLConnection.cpp
index 872b77c6..f7e694b4 100644
--- a/otsdaq-utilities/ECLWriter/ECLConnection.cpp
+++ b/otsdaq-utilities/ECLWriter/ECLConnection.cpp
@@ -57,6 +57,14 @@ bool ECLConnection::Get(std::string s, std::string& response)
 	{
 		needSignature = true;
 		//in case of dynamic server downtime, if safe_url is blank, get safe_url
+
+		if(time(0) - _lastOperationTime > 5*60 /* 5 minutes */)
+		{
+			__COUTT__ << "Clearing safe URL and re-requesting..." << __E__;
+			_safe_url = "";
+		}
+
+		__COUTTV__(_safe_url);
 		if(_safe_url == "" && !Get("/secureURL", _safe_url))
 		{
 			__SS__ << "Could not retrieve safe URL from input url '" << _url << "'" << __E__;
@@ -175,6 +183,7 @@ bool ECLConnection::Get(std::string s, std::string& response)
 	__COUTVS__(2,responseBuffer);
 	response = responseBuffer;
 
+	_lastOperationTime = time(0);
 	return true;
 } //end Get()
 
diff --git a/otsdaq-utilities/ECLWriter/ECLConnection.h b/otsdaq-utilities/ECLWriter/ECLConnection.h
index 9b3d151d..c6d9c046 100644
--- a/otsdaq-utilities/ECLWriter/ECLConnection.h
+++ b/otsdaq-utilities/ECLWriter/ECLConnection.h
@@ -37,6 +37,7 @@ class ECLConnection
 	std::string _user;
 	std::string _pwd;
 	std::string _url, _safe_url;
+	time_t		_lastOperationTime = 0;
 };
 
 #endif
diff --git a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
index 81919acb..0063a738 100644
--- a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
+++ b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
@@ -9,7 +9,6 @@
 #include "otsdaq/TablePlugins/XDAQContextTable/XDAQContextTable.h"
 #include "otsdaq/XmlUtilities/HttpXmlDocument.h"
 
-#include "otsdaq-utilities/ECLWriter/ECLConnection.h"
 
 #include <dirent.h>   /*DIR and dirent*/
 #include <sys/stat.h> /*mkdir*/
@@ -77,6 +76,7 @@ try
 	CategoryName_ = __ENV__("OTS_OWNER") + std::string(" ots");
 
 
+
 	// Determine the timezone offset from UTC time in hours
     // Get the current time
     std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
@@ -97,6 +97,9 @@ try
 
 	__SUP_COUTV__(timezoneHourOffset_);
 
+
+	eclConn_ = std::make_unique<ECLConnection>(ECLUser_, ECLPwd_, ECLHost_);
+
 	
 }  // end init()
 catch(const std::runtime_error& e)
@@ -346,8 +349,7 @@ void ECLSupervisor::getCategories(HttpXmlDocument* xmlOut, std::ostringstream* o
 	}
 
 	std::string response, url = "/A/xml_category_list";
-	ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
-	eclConn.Get(url,response);
+	eclConn_->Get(url,response);
 	__COUTTV__(response);
 
 	std::vector<std::string> exps;
@@ -472,9 +474,9 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 	
 	if(0) //test xml_get
 	{
-		std::string response, url = "/E/xml_get?e=" + std::string("2502"); //does not return subject!
-		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
-		eclConn.Get(url,response);
+		std::string response, url = "/E/xml_get?e=" + std::string("2502"); 
+		//ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
+		eclConn_->Get(url,response);
 		__COUTV__(response);
 	}
 	
@@ -530,8 +532,8 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 			__COUTTV__(baseTimeTmBuffer);	
 			url += "&a=" + std::string(baseTimeTmBuffer) + "+00:00:00"; //after			
 		}
-		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
-		eclConn.Get(url,response);
+		// ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
+		eclConn_->Get(url,response);
 		__COUTVS__(3,response);
 
 		//example response:
@@ -570,6 +572,7 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 		std::string id, author, subject, category, timestamp, files, images, text;
 		size_t after = 0, before = -1, entryCount = 0;
 		std::tm tm;
+		std::string preText, postText;
 
 		while((id = //StringMacros::extractXmlField(response, "entry", 0, after, &after, 
 			StringMacros::rextractXmlField(response, "entry", 0, before, &before,  //e.g. for reverse order
@@ -587,7 +590,11 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 			category = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
 				"category=", "\"");				
 			timestamp = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
-				"timestamp=", "\"");
+				"timestamp=", "\"");		
+			images = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
+				"images=", "\"");		
+			files = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
+				"files=", "\"");
 
 			__COUTVS__(2,author);
 			__COUTVS__(2,timestamp);	
@@ -602,6 +609,53 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 			text = StringMacros::extractXmlField(response, "pre class=\"html_safe_entry\"", 0, after, nullptr, 
 				"", ">");
 			__COUTVS__(2,text.size());
+			if(text.size() == 0)
+			{
+				text = StringMacros::extractXmlField(response, "text", 0, after, nullptr, 
+					"", ">");
+				__COUTVS__(2,text.size());
+			}
+			__COUTVS__(2,text);	
+
+			preText = ""; postText = "";
+			bool needAttachments = false;
+			if(atoi(images.c_str()))
+			{
+				needAttachments = true;
+				preText += "Attached Images: " + images + "\n<br>";
+			}
+			if(atoi(files.c_str()))
+			{
+				needAttachments = true;
+				preText += "Attached Files: " + files + "\n<br>";
+			}
+
+			if(needAttachments)
+			{
+				std::string response, url = "/E/xml_get?e=" + id;
+				// ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
+				eclConn_->Get(url,response);
+				__COUTV__(response);
+
+				size_t fileCount = atoi(files.c_str());
+				__COUTV__(fileCount);
+				for(size_t j=0;j<fileCount;++j)
+				{
+					std::string furl = 
+						StringMacros::extractXmlField(response, "attachment", 0, after, nullptr, 
+							"url=", "\"");
+					
+					__COUTVS__(2,furl);	
+					std::string fname = 
+						StringMacros::extractXmlField(response, "attachment", 0, after, nullptr, 
+							"filename=", "\"");
+					
+					__COUTVS__(2,fname);		
+					postText += "<br><a href='" + furl + "'>" + fname + "</a>";																												
+				}
+			} //end attachment handling
+
+			text = preText + (preText.size()?"\n<br>":"") + text + postText;
 			__COUTVS__(2,text);	
 
 			if(xmlOut)
@@ -641,10 +695,18 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 
 	if(xmlOut && mostRecentTime)
 	{
-		__COUTTV__(mostRecentTime);
-		__COUTTV__(((time(0) - mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24)));
+		size_t mostRecentDayIndex = (mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24);
+		size_t nowDayIndex = (time(0) + timezoneHourOffset_*60*60)/(60 * 60 * 24);		
+		if(TTEST(30))
+		{
+			__COUTTV__(mostRecentDayIndex);
+			__COUTTV__(nowDayIndex);
+			__COUTTV__(mostRecentTime);
+			__COUTTV__(((time(0) - mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24)));			
+		}
+		__COUTTV__(nowDayIndex - mostRecentTime);
 		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, //0 is today
-					((time(0) - mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24)));  // send most recent day index found in response
+					nowDayIndex - mostRecentTime);  // send most recent day index found in response
 	}
 	else 
 		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, 0); //0 is today
@@ -714,8 +776,8 @@ xoap::MessageReference ECLSupervisor::MakeSystemLogEntry(xoap::MessageReference
 	eclEntry.form(form);
 	try
 	{
-		ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
-		if(!eclConn.Post(eclEntry))
+		// ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
+		if(!eclConn_->Post(eclEntry))
 		{
 			__COUT_ERR__ << "Failure to post ECL entry." << __E__;
 			retStr = "Failure";
diff --git a/otsdaq-utilities/ECLWriter/ECLSupervisor.h b/otsdaq-utilities/ECLWriter/ECLSupervisor.h
index f2797fca..af45ed09 100644
--- a/otsdaq-utilities/ECLWriter/ECLSupervisor.h
+++ b/otsdaq-utilities/ECLWriter/ECLSupervisor.h
@@ -31,6 +31,8 @@
 #include <string>
 #include "otsdaq/CoreSupervisors/CoreSupervisorBase.h"
 
+#include "otsdaq-utilities/ECLWriter/ECLConnection.h"
+
 // clang-format off
 namespace ots
 {
@@ -81,6 +83,8 @@ class ECLSupervisor : public CoreSupervisorBase
 	std::string                           	CategoryName_;
 	size_t									timezoneHourOffset_ = 0;
 
+	std::unique_ptr<ECLConnection>			eclConn_;
+
 	const std::string						EscapeECLString					(const std::string& input = "");
 };
 }

From 05632245a300fed47ec23de79cc27a87bc6eba3b Mon Sep 17 00:00:00 2001
From: RYAN A RIVERA <rrivera@FNAL.GOV>
Date: Mon, 6 Jan 2025 12:46:27 -0600
Subject: [PATCH 4/4] Color change to Subsystem Launch; Logbook html now
 working with ECL Supervisor, allowing category selection and omission; Minor
 improvements to MultiSelectBox; Minor ots Desktop infrastructure improvements
 for window width/height/time/icon handling; Fixed bug in CalendarPopup API;
 ECL Supervisor seems to be fully functional now.

---
 WebGUI/css/SubsystemLaunch.css                |   8 +-
 WebGUI/html/Logbook.html                      | 477 +++++++++++++++---
 WebGUI/html/MultiSelectBoxTest.html           |   8 +-
 WebGUI/js/Debug.in.js                         |   1 +
 WebGUI/js/Desktop.js                          |  10 +-
 WebGUI/js/DesktopContent.js                   |  15 +-
 WebGUI/js/DesktopIcons.js                     |  15 +-
 WebGUI/js/DesktopWindow.js                    |   9 +-
 WebGUI/js/SubsystemLaunch.js                  |   5 +-
 WebGUI/js/js_lib/CalendarPopup.js             | 115 +++--
 WebGUI/js/js_lib/MultiSelectBox.js            |  90 +---
 otsdaq-utilities/ECLWriter/ECLConnection.h    |   1 +
 otsdaq-utilities/ECLWriter/ECLSupervisor.cc   | 264 ++++++++--
 otsdaq-utilities/ECLWriter/ECLSupervisor.h    |   8 +-
 otsdaq-utilities/Logbook/LogbookSupervisor.cc |  12 +-
 otsdaq-utilities/Logbook/LogbookSupervisor.h  |   2 +-
 16 files changed, 773 insertions(+), 267 deletions(-)

diff --git a/WebGUI/css/SubsystemLaunch.css b/WebGUI/css/SubsystemLaunch.css
index 8d1be6ed..02bd4e9d 100755
--- a/WebGUI/css/SubsystemLaunch.css
+++ b/WebGUI/css/SubsystemLaunch.css
@@ -1,9 +1,9 @@
 
 
 		body {	
-			padding:0;
-			margin:0;
-			background-color:white;
+			padding: 0;
+			margin: 0;
+			background-color:rgb(78 58 58);
 		}
 
 		/* make links have a hand cursor */
@@ -57,7 +57,7 @@
 		#runDiv {
 			height: 60px;
 			margin-bottom: 0px;
-			color: rgb(136, 102, 102);
+			color: white; /* rgb(136, 102, 102); */
 			font-size: 20px;
 			font-family: "Comfortaa", arial;
 		}
diff --git a/WebGUI/html/Logbook.html b/WebGUI/html/Logbook.html
index 87c3762a..3cc7c282 100755
--- a/WebGUI/html/Logbook.html
+++ b/WebGUI/html/Logbook.html
@@ -16,7 +16,9 @@
 			}
 			
 			a {
-				color: blue;
+				color: rgb(180,207,237);	
+				font-weight: 800;
+				text-shadow: 0.1em 0.1em 0.2em black;
 			}
 			
 			hr {				
@@ -31,6 +33,7 @@
 				padding: 5px;
 				border: 1px solid black;
 		    	cursor: pointer;
+				height: 23px;
 			}
 			
 			div {
@@ -65,7 +68,8 @@
 
 			.areaContentDiv {
 			    border-radius: 5px;
-				overflow: hidden;
+				/* overflow-x: auto;
+				overflow-y: hidden; */
 			}
 			
 			.areaContent {
@@ -123,6 +127,13 @@
 				margin-left: 10px;
 				text-shadow: 0.1em 0.1em 0.2em black;
 			}
+
+			#categoryHeaderLabel {
+				white-space: nowrap;
+				overflow-x: auto;
+				font-size: 22px;
+			}
+
 			
 			#currentCategoryHeader {
 				font-weight: 800;
@@ -278,17 +289,15 @@
 			
 				font-size: 24px;
 				font-weight: 800;
-				/*margin: -30px 0 0 0;*/
-			/*background-color: black;*/
+				
+				cursor: pointer;
+				/*background-color: black;*/
 			}
 			
 			.Logbook-entryTime {
 				float: right;
 				height: 15px;
-				padding: 2px 10px 0 0;
-				
-			/*margin: -30px 0 0 0;*/
-
+				padding: 2px 10px 0 0;				
 			}
 			
 			.Logbook-entryCreator {
@@ -296,8 +305,6 @@
 				float: right;
 				height: 15px;
 				padding: 2px 10px 0 0;
-			
-			/*margin: -30px 0 0 0;*/
 			}
 
 			.Logbook-entryBody {
@@ -364,10 +371,16 @@
 			
 			//functions:			
 				//init()	
+				
 				//setActiveCategory(category)
+				//setResponseCategory(category)
 				//toggleCategoryFilter()
+				//initCategoryFilter(preselects)
+				//handleCategoryFilterChange(el)
+
 				//handleCategoryChangeRequest(req)
 				//handleGetCategoryListRequest(req)
+				
 				//redrawLogbook()
 				//redrawExpandButtons()
 				//toggleArea(i)
@@ -385,13 +398,16 @@
 				//handleCategoryInputKeyDown(e)
 				//handleSearchKeyUp()
 				//handleTimeoutSearchKeyUp()
+				
 				//createCategory()
 				//removeCategory()
 				//displayCategories()
 				//applyCategoriesSearch(needle)
 				//activeCategorySetRequest(category)
 				//clearCategoryInput()
+
 				//refreshLogbook(date,duration)
+				//toggleAutoRefresh()
 				//handleRefreshLogbook(req)
 				//displayLogbookEntry(divEl,entry)
 				//adminRemoveRestoreEntry(entryId, hide)
@@ -408,6 +424,7 @@
 
 			var _MARGIN = 20;
 			var _HIDDEN_HEIGHT = 33;
+			var _CATEGORY_FILTER_HEIGHT = 338;
 			var _AREA_HEIGHTS = [270,390,500];
 			var _MAX_CATEGORY_NAME_LENGTH = 300;
 			var _DEFAULT_ENTRY_INPUT_TEXT = "Enter the text for your logbook post here.";
@@ -417,6 +434,7 @@
 			
 			var _CategorySearchTimer = 0;
 			var _activeCategory = "";
+			var _categoryFilter = ""; //* for all, if "" go with active category
 			var _categorysShowArray, _categorysArray;
 						
 			//preload loader spinner gif
@@ -429,7 +447,7 @@
 			
 			//refreshing logbook
 			var _refreshDayIndex = 0; 	//init to most recent because two undefines, 0=today, 1=yesterday, etc..
-			var _refreshDuration = 1;	//init to 1 day
+			var _refreshDuration = 14;	//init to 2-weeks
 			var _mostRecentDayIndex = -1;
 			var _logbookUpdateTimer = 0;
 			var _REFRESH_INTERVAL = 10000; //10 seconds
@@ -445,6 +463,18 @@
 			{	
 				Debug.log("init()");
 
+				if(DesktopContent._windowMessagingInactive) //assume in standalone mode
+				{
+					Debug.log("Standalone mode detected -- Enabling navigation prompt");
+					// Enable navigation prompt 
+					//	(to prevent accidental/back/forward/nav leaving the page) "Leave page?" on chrome
+					window.onbeforeunload = function() {
+						return true;
+					};	
+
+					window.parent.document.title = "ots ECL";					
+				}
+
 				//init area elements
 				for(var i=0;i<_AREAS.length;++i)
 					_areaEls[i] = document.getElementById(_AREAS[i] + 'Area');
@@ -467,29 +497,83 @@
 						"/WebPath/images/windowContentImages/logbook-expand.png";
 				}
 
+				//check for category preselects:
+				var preselects = DesktopContent.getDesktopWindowParameter(0,"categories");
+				var preselectsArr = [];
+				if(preselects)
+				{
+					preselectsArr = preselects.split(',');
+					Debug.log("preselectsArr",preselectsArr);
+				}
+
 				DesktopContent.XMLHttpRequest("Request?RequestType=GetCategoryList", 		//update category list 
-						"", handleGetCategoryListRequest);					
-			} //end init()
+						"", handleGetCategoryListRequest, preselectsArr);					
+			} //end init()		
 
 			//=====================================================================================
 			//setActiveCategory ~
 			function setActiveCategory(category) 
 			{					
 			    Debug.log("Logbook setActiveCategory to " + category);
+
 				_activeCategory = category;
 				var str = "";
+				
+				str += "<center>";
+				str += "<div id='categoryHeaderLabel'>";
 				if(!_activeCategory || _activeCategory == "")
 				{	_activeCategory = ""; str += "No Active Category Set"; 	}
 				else
-					str += "<font color='white'>Active Category is</font> " + _activeCategory;
+					str += "<font color='white'>Active Category is</font> " + _activeCategory;				
+				str += "</div>";
 
-				str += "<div style='float:right; margin: 3px 8px 0 -350px;'>" +
-					"<a class='logbookNotSelected' href='#' onclick='toggleCategoryFilter()'>" + 
+				str += "<div style='margin: 3px 8px -21px 0;'>" +
+					"<a href='#' onclick='toggleCategoryFilter()'>" + 
 						"hide/show Categories" + 
-					"</a></div><div id='categoryFilterMultiselect' style='display:none;'></div>";
+					"</a></div>";
+													
+				var el = document.getElementById("categoryFilterMultiselect");
+				var display = el && (categoryFilterMultiselect.style.display != "none");				
+				//if displayed, toggle height to revert to hidden
+				if(display) 
+					_AREA_HEIGHTS[0] -= _CATEGORY_FILTER_HEIGHT;
+
+				str += "<div id='categoryFilterMultiselect' style='display:none" +					
+					"; height:300px; margin-bottom:0px; margin-top:30px;'></div>";
+
+				str += "<a id='toggleAllNoneCategory' style='display:none" + 
+						"; font-size:14px; padding:10px; margin-top:-15px;' " +
+						"href='#' onclick='toggleAllNoneCategorySelect()'>" + 
+							"select all/none" + 
+						"</a>";
+
+				str += "&nbsp;&nbsp;&nbsp; "+
+						"<a id='openSelectedCategoriesTabLink' style='display:none" + 
+						"; font-size:14px; padding:10px; margin-top:-15px;' " +
+						"href='#' target='_blank'>" + 
+							"open selected in new tab" + 
+						"</a>";
+				str += "</center>";
 
 				currentCategoryHeader.innerHTML = str;
 			} //end setActiveCategory()
+
+			//=====================================================================================
+			//setResponseCategory ~
+			function setResponseCategory(category) 
+			{					
+			    Debug.log("Logbook setResponseCategory to " + category);
+
+				if(category.length && category[0] == '!') //improve inverted wording
+					category = "all wo/" + category.substr(1);
+
+
+				var str = "";
+				str += "<font color='white'>Showing Log Entries for </font> " + category;
+				categoryHeaderLabel.innerHTML = str;
+
+				window.parent.document.title = "ots ECL - " + category;
+			} //end setResponseCategory()
 			
 			//=====================================================================================
 			//toggleCategoryFilter ~
@@ -500,22 +584,158 @@
 				if(categoryFilterMultiselect.innerHTML == "")
 				{
 					Debug.log("init category multiselect");
+					initCategoryFilter();
+				}
+
+				//toggle dislpay
+				var display = categoryFilterMultiselect.style.display == "none";
+				if(display)
+				{
+					Debug.log("Show");
+					categoryFilterMultiselect.style.display = "block";
+					toggleAllNoneCategory.style.display = "inline-block";
+					openSelectedCategoriesTabLink.style.display = "inline-block";
+					_AREA_HEIGHTS[0] += _CATEGORY_FILTER_HEIGHT;
+					_areaEls[0].style.height = _AREA_HEIGHTS[0] + "px";
 				}
 				else
 				{
-					//toggle dislpay
-					var display = categoryFilterMultiselect.style.display == "none";
-					if(display)
+					Debug.log("Hide");
+					categoryFilterMultiselect.style.display = "none";
+					toggleAllNoneCategory.style.display = "none";
+					openSelectedCategoriesTabLink.style.display = "none";
+					_AREA_HEIGHTS[0] -= _CATEGORY_FILTER_HEIGHT;
+					_areaEls[0].style.height = _AREA_HEIGHTS[0] + "px";
+				}
+
+				redrawExpandButtons();
+			} //end toggleCategoryFilter()
+
+			//=====================================================================================
+			//initCategoryFilter ~
+			function initCategoryFilter(preselects) 
+			{					
+				_categoryFilter = ""; //clear
+			    Debug.log("Logbook initCategoryFilter()", 
+					_categorysArray.length, preselects);
+
+				//////////// make search box (copied from MultiSelectBoxTest.html)
+				{	
+					var noMultiSelect = false; // true or false (false for multiselect functionality) 
+					var maintainPreviousSelections = true; //true or false (true means redraw select box using the js array selects left over from the last time this box was drawn using the same element id)
+					
+					var vals = [];
+					for(var i=0;i<_categorysArray.length;++i)
+						vals[i] = _categorysArray[i].getAttribute('value');
+
+					var keys = undefined;
+					var types = undefined;
+										
+					//write to a particular div
+					var el = categoryFilterMultiselect;  
+					MultiSelectBox.createSelectBox(el,
+							"categoryFilterMultiselect",
+							"Category Selection Filter",
+							vals,keys,types,handleCategoryFilterChange,noMultiSelect);
+					
+					if(!preselects)
+	            	{
+						MultiSelectBox.initMySelectBoxes(!maintainPreviousSelections);
+						return;
+					}	
+					//else set pre-selections as selected	  
+					
+					MultiSelectBox.initMySelectBoxes(true); //init to clear
+
+					var invertedSelection = false;
+					if(preselects.length && preselects[0].length && preselects[0][0] == '!')
 					{
-						Debug.log("Show");
+						invertedSelection = true;
+						preselects[0] = preselects[0].substr(1);
 					}
-					else
+
+
+					for(var j=0;j<preselects.length;++j)
+						for(var i=0;i<vals.length;++i)
+							if((preselects[j] == '*' || //all select
+									(!invertedSelection && preselects[j].trim() == vals[i])) || //normal select
+								(invertedSelection && 
+									preselects[j].trim() != vals[i])) //inverted select
+								MultiSelectBox.setSelectionElementByIndex(el,i,true);	
+					MultiSelectBox.initMySelectBoxes(false); //setup selections	
+					
+					handleCategoryFilterChange(el);
+				}
+				//////////// end make search box				
+
+			} //end initCategoryFilter()
+
+			//=====================================================================================
+			//handleCategoryFilterChange ~
+			function handleCategoryFilterChange(el)
+			{
+				Debug.log("handleCategoryFilterChange()");
+
+				var i = MultiSelectBox.getSelectedIndex(el); 
+				var selArr = MultiSelectBox.getSelectionArray(el);
+				if(selArr[i])
+					Debug.log("Chosen element index:",i,            		
+						" value:",el.textContent,
+						" key:",el.getAttribute("key-value"),
+						" type:",el.getAttribute("type-value"));
+				
+				var selStr = "", invSelStr = "";
+				var isAll = true;
+				var countWithout = 0; //see if only 1 to 3 without
+				for(var s in selArr)
+					if(selArr[s])
+						selStr += (selStr.length?", ":"") + 
+							MultiSelectBox.getSelectionElementByIndex(el,s).textContent;
+					else 
 					{
-						Debug.log("Hide");
+						isAll = false;
+						++countWithout;
+						invSelStr += (invSelStr.length?", ":"") + 
+							MultiSelectBox.getSelectionElementByIndex(el,s).textContent;
 					}
+
+				Debug.logv({selStr});	
+				
+				_categoryFilter = isAll?"*":selStr;
+
+				if((selArr.length > 10 && countWithout < 4) || 
+					(selArr.length > 4 && countWithout == 1))
+				{	//then change to wo/ inverted selection
+					_categoryFilter = "!" //(indicator) 
+						+ invSelStr;
 				}
+					
+								
+				var newTabUrl = DesktopContent._localOrigin + "/urn:xdaq-application:lid=" + DesktopContent._localUrnLid + "/";
 
-			} //end toggleCategoryFilter()
+				newTabUrl += "?categories=" + encodeURIComponent(_categoryFilter);
+				Debug.logv({newTabUrl});	
+					
+				openSelectedCategoriesTabLink.href = newTabUrl;
+			} //end handleCategoryFilterChange()
+			
+			//=====================================================================================
+			//toggleAllNoneCategorySelect ~
+			function toggleAllNoneCategorySelect()
+			{
+				Debug.log("toggleAllNoneCategorySelect()");
+
+				var selArr = MultiSelectBox.getSelectionArray(categoryFilterMultiselect);
+
+				if(!selArr.length) return;
+
+				var setVal = !selArr[0];
+				for(var i=0;i<selArr.length;++i)
+					MultiSelectBox.setSelectionElementByIndex(categoryFilterMultiselect,i,setVal);	
+			
+				MultiSelectBox.initMySelectBoxes(false); //setup selections	
+				handleCategoryFilterChange(categoryFilterMultiselect);
+			} //end toggleAllNoneCategorySelect()
 
 			//=====================================================================================
 			//redrawLogbook ~
@@ -523,23 +743,26 @@
 			{	
 			    Debug.log("Logbook redrawLogbook to " + _isAdmin + " - " + window.innerWidth + " - " + window.innerHeight);
 			    
-			    var w = window.innerWidth;
+			    var w = DesktopContent.getWindowWidth();
 			    if(w < 600) w=600; //prevent super squeeze
-			    var h = window.innerHeight;
 			    			    
 				for(var i=0;i<_AREAS.length;++i)
 				{
 					//only show admin area if have privileges
-					if(!i && !_isAdmin) { 
+					if(i == 0 && !_isAdmin) 
+					{ 
 						_areaEls[i].style.display = "none"; 
 						_isAreaExpanded[i] = true; 
-						_AREA_HEIGHTS[i] = 0; 
+
+						var el = document.getElementById("categoryFilterMultiselect");
+						var display = el && (categoryFilterMultiselect.style.display != "none");	
+						_AREA_HEIGHTS[i] = display?_CATEGORY_FILTER_HEIGHT:0; 
 						continue; 
 					}
 					_areaEls[i].style.display = "block"; 
 
-					 _areaEls[i].style.left = _MARGIN + "px";
-					 _areaEls[i].style.width = (w - _MARGIN*2) + "px";
+					_areaEls[i].style.left = _MARGIN + "px";
+					_areaEls[i].style.width = (w - _MARGIN*2) + "px";
 				}
 			    
 			    redrawExpandButtons();
@@ -549,7 +772,7 @@
 			//redrawExpandButtons ~
 			function redrawExpandButtons() 
 			{					
-				var yoff = 20;
+				var yoff = 32;
 				for(var i=0;i<_AREAS.length;++i)
 				{
 					document.getElementById("expandBtnImg"+i+"-hide").style.display = 
@@ -706,11 +929,13 @@
 			         .replace(/%3E/g, "&gt;")				//>
 			         .replace(/%22/g, "&quot;")				//"
 			         .replace(/%27/g, "&#039;")				//'
+					 .replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;")//tab
 			         .replace(/%0A%0D/g, "<br>")			//newline
-					 .replace(/&#010;/g, "<br>")			//newline
+					 .replace(/&#010;/g, "<br>")			//newline					 
+					 .replace(/\n/g, 	 "<br>")			//newline
 			         .replace(/%20%20/g, "&nbsp;&nbsp;");	//space        
 			} //end convertForClient()
-			
+		
 			//=====================================================================================
 			//uploadToServer ~~
 			//	upload logbook entry to server.
@@ -871,21 +1096,38 @@
 
 			//=====================================================================================
 			//handleGetCategoryListRequest ~~ 
-			function handleGetCategoryListRequest(req) 
+			function handleGetCategoryListRequest(req, preselectsArr) 
 			{
 				_isAdmin = DesktopContent.getXMLValue(req,"is_admin")=="1"?1:0;
 
+				_categorysArray = req.responseXML.getElementsByTagName("category");
+
 				if(_isAdmin) 
 				{				
 					//reset active category, in case request was a setActiveCategory request
 					setActiveCategory(DesktopContent.getXMLValue(req,"active_category")); 
 					
-					_categorysArray = req.responseXML.getElementsByTagName("category");
 					_categorysShowArray = new Array(); //init all elements to show
 					for(var i=0;i<_categorysArray.length;++i) _categorysShowArray[i] = 1;
 					
 					displayCategories();
-				}				
+				}		
+				
+				initCategoryFilter(preselectsArr);
+
+				if(DesktopContent._windowMessagingInactive) //assume in standalone mode and no user credential for log entry, so just provide link
+				{
+					var str = ""; //create alternate text for posting entry
+
+					var ecl_url = DesktopContent.getXMLValue(req,"ecl_url"); 
+					if(ecl_url && ecl_url != "")
+					{
+						str += "Click <a target='_blank' href='" + ecl_url + 
+							"/E/create_entry'>here</a> to create a new Logbook entry.";
+						postFormDiv.innerHTML = str;
+						_AREA_HEIGHTS[1] = 72; // shrink new post area
+					}
+				}
 
 				redrawLogbook(); //setup window divs based on admin	
 				refreshLogbook(); //refresh logbook, by default start with today for one day
@@ -957,6 +1199,29 @@
 				displayCategories();
 			} //end clearCategoryInput()
 
+			//=====================================================================================
+			//toggleAutoRefresh ~~ 
+			var _autoRefreshTimer = 0;
+			function toggleAutoRefresh() 
+			{
+				Debug.log("Logbook toggleAutoRefresh()");
+				if(_autoRefreshTimer) window.clearTimeout(_autoRefreshTimer);
+				_autoRefreshTimer = 0;
+
+				if(autoRefreshLink.innerText.indexOf("off") > 0)
+				{ //then turn on					
+					autoRefreshLink.innerText = "Auto-refresh is on";
+
+					_autoRefreshTimer = window.setTimeout(refreshLogbook, 30 * 1000 /* 30 seconds */);
+					refreshLogbook(); //and refresh now!
+				}
+				else //turn off
+				{
+					autoRefreshLink.innerText = "Auto-refresh is off";
+				}
+
+			} //end toggleAutoRefresh()
+			
 			//=====================================================================================
 			//refreshLogbook ~~ 
 			//	generates request for logbook based on dayIndex and duration 
@@ -964,8 +1229,9 @@
 			//		duration is number of days in past to request
 			//		if either is undefined, last request value is used
 			//	request is looking for time_t seconds
+			var _delayLogbookRequestTimer = 0;
 			function refreshLogbook(dayIndex,duration) 
-			{
+			{		
 				Debug.log("Logbook refreshLogbook " + dayIndex + " - " + duration);
 				if(_activeCategory == "")	{ 
 					Debug.log("Logbook refreshLogbook active category not set"); 
@@ -982,12 +1248,26 @@
 				var reqDate = (((((new Date()).getTime())/(1000*60*60*24)) | 0) - _refreshDayIndex)*24*60*60;
 				if(_mostRecentDayIndex < 0) //most recent day request 
 					reqDate = 0; //to indicate get most recent day
-				DesktopContent.XMLHttpRequest("Request?RequestType=RefreshLogbook", 		//update category list 
-						"Date="+reqDate+"&Duration="+_refreshDuration, 
-						handleRefreshLogbook);				
-				
+
+				Debug.logv({_categoryFilter});	
+
 				//always show date
 				refreshDateDisplay();
+
+				Debug.log("Logbook refreshLogbook start timer");
+				if(_delayLogbookRequestTimer) window.clearTimeout(_delayLogbookRequestTimer);
+				_delayLogbookRequestTimer = window.setTimeout(function()
+					{
+						if(_delayLogbookRequestTimer) window.clearTimeout(_delayLogbookRequestTimer);
+						_delayLogbookRequestTimer = 0;
+
+						DesktopContent.XMLHttpRequest("Request?RequestType=RefreshLogbook", 		//update category list 
+								"Date=" + reqDate +
+								"&Duration=" + _refreshDuration + 
+								"&CategoryFilter=" + encodeURIComponent(_categoryFilter),  //* for all, if "" go with active category
+								handleRefreshLogbook);	
+					
+					}, 500 /* ms */ ); //end delay handler
 				
 			} //end refreshLogbook()
 			
@@ -998,6 +1278,12 @@
 			function handleRefreshLogbook(req) 
 			{
 				Debug.log("Logbook handleRefreshLogbook", req.responseText.length);
+
+				if(_autoRefreshTimer)  //reset interval, in case of long response times
+				{
+					window.clearTimeout(_autoRefreshTimer);
+					_autoRefreshTimer = window.setTimeout(refreshLogbook, 30 * 1000 /* 30 seconds */);
+				}
 		        
 		        var logbookStatus;
 				if((logbookStatus = DesktopContent.getXMLValue(req,"logbook_status")) !="1") //failed 
@@ -1010,25 +1296,35 @@
 						_refreshDayIndex = parseInt(mostRecentDayStr);
 					_mostRecentDayIndex = parseInt(mostRecentDayStr);
 					var mostRecentDayEl = document.getElementById("logbookHeader").getElementsByTagName("a")[0];
-					//if(_mostRecentDayIndex == 0)
-					//	mostRecentDayEl.innerHTML = "Today";
-					//else if(_mostRecentDayIndex == 1)
-					//	mostRecentDayEl.innerHTML = "Yesterday";
-					//else
-					//	mostRecentDayEl.innerHTML = "Most Recent Day";
+					if(_mostRecentDayIndex == 0)
+						mostRecentDayEl.innerHTML = "Today";
+					else if(_mostRecentDayIndex == 1)
+						mostRecentDayEl.innerHTML = "Yesterday";
+					else
+						mostRecentDayEl.innerHTML = "Most Recent Day";
 
 					refreshDateDisplay();
 					
 					//extract logbook display
 					var entries = req.responseXML.getElementsByTagName("logbook_entry");
-					setActiveCategory(DesktopContent.getXMLValue(req,"active_category"));
+					// setActiveCategory(DesktopContent.getXMLValue(req,"active_category"));
+					setResponseCategory(DesktopContent.getXMLValue(req,"response_category"),1 /* isResponse */);
 
 					var logbookEl = document.getElementById("logbookDiv");
 					logbookEl.innerHTML = "";
 					
 					//display from newest to oldest
 					for(var i=entries.length-1;i>=0;--i)
-						displayLogbookEntry(logbookEl,entries[i]);					
+						displayLogbookEntry(logbookEl,entries[i]);		
+					
+						
+					//add helper to move starting date back
+					var tmp = document.createElement("div");
+					tmp.setAttribute("id", "clearDiv");
+					logbookEl.appendChild(tmp); 
+					var tmp = document.createElement("div");
+					tmp.innerText = "Note: If you are expecting more entries for the selected critieria, try moving the selected date back in time.";
+					logbookEl.appendChild(tmp); 
 				}
 		        
 				 //schedule next update
@@ -1036,8 +1332,47 @@
 			    	clearTimeout(_logbookUpdateTimer);
 		        //_logbookUpdateTimer = window.setTimeout(refreshLogbook,_REFRESH_INTERVAL);  //NOTE: if want refresh every period, uncomment.
 		        																				//currently user must use manual refresh
+
+
+				redrawLogbook(); //in case of new scroll bars
 			} //end handleRefreshLogbook()
 
+			//=====================================================================================
+			//replaceBrWithSpace ~~ 
+			// Replace all <br> tags with a space
+			function replaceBrWithSpace(el) 
+			{
+				el.isBrReplaced = "true";
+				el.querySelectorAll('br').forEach(br => {
+					const space = document.createTextNode(' ');
+					space.isBr = "true"; // Mark it for restoration
+					br.replaceWith(space);
+				});
+
+				var condensedWidth = currentCategoryHeader.offsetWidth;
+				el.setAttribute("style", "white-space: nowrap; overflow-x: hidden; width: " + 
+					(condensedWidth-130) + "px;" +
+					"padding-top: 2px; padding-bottom: 10px; color: rgb(216 189 139);");
+			} //end replaceBrWithSpace()
+
+			//=====================================================================================
+			//restoreBr ~~ 
+			// Restore <br> tags
+			function restoreBr(el) 
+			{
+				el.isBrReplaced = undefined;
+				el.childNodes.forEach(node => {
+					if (node.nodeType === Node.TEXT_NODE && node.data.trim() === '' && node.isBr === "true") {
+						const br = document.createElement('br');
+						node.replaceWith(br);
+					}
+				});
+				var condensedWidth = currentCategoryHeader.offsetWidth;
+				el.setAttribute("style", "overflow-x: auto; width: " + 
+					(condensedWidth-130) + "px;" +
+					"padding-top: 20px; padding-bottom: 20px; color: rgb(252 217 164);");
+			} //end restoreBr()
+
 			//=====================================================================================
 			//refreshDateDisplay ~~ 
 			function refreshDateDisplay() 
@@ -1063,7 +1398,7 @@
 						aArr[i].setAttribute("class", "logbookSelection");
 					else if(i == 1 && !(reqTime == 0 || _refreshDayIndex == _mostRecentDayIndex))
 						aArr[i].setAttribute("class", "logbookSelection");
-					else if(i > 1 && i < 8 && aArr[i].innerHTML == _refreshDuration) //durations
+					else if(i > 1 && i < 15 && aArr[i].innerText == _refreshDuration) //durations
 						aArr[i].setAttribute("class", "logbookSelection");
 					else
 						aArr[i].setAttribute("class", "logbookNotSelected");
@@ -1133,14 +1468,16 @@
 				    divEl.appendChild(omni);			    //add entry to div element  
 				    return;			    	
 			    }
-                          
+                         
+				var entryText = convertForClient(
+					entry.getElementsByTagName("logbook_entry_text")[0].getAttribute("value"));
+							
                 if(creator == "SYSTEM LOG") //System Logbook Entry
                 {
                     var sysLogDiv = document.createElement("div");
 				    sysLogDiv.setAttribute("class", "Logbook-sysLogDiv");
 				    sysLogDiv.innerHTML = timeVal.toDateString() + " " + timeVal.toLocaleTimeString() + " -- " +
-                          convertForClient(
-							entry.getElementsByTagName("logbook_entry_text")[0].getAttribute("value"));
+						entryText;
 				    omni.appendChild(sysLogDiv);
 				    divEl.appendChild(omni);			    //add entry to div element  
 				    return;	              
@@ -1162,7 +1499,19 @@
 			    //subject
 			    tmp = document.createElement("div");
 			    tmp.setAttribute("class", "Logbook-entrySubject");
+			    tmp.setAttribute("title", "Click to expand/collapse log entry.");
 			    tmp.innerHTML = entry.getElementsByTagName("logbook_entry_subject")[0].getAttribute("value");
+				tmp.onclick = function()
+				{
+					//navigate to entry 'body' element
+					var el = this.parentElement.parentElement.children[1];	
+					Debug.log("Toggle expand/collaps entry", el.textContent);
+
+					if(el.isBrReplaced)
+						restoreBr(el);
+					else
+						replaceBrWithSpace(el);
+				}
 			    header.appendChild(tmp);
 			    //time
 			    tmp = document.createElement("div");
@@ -1175,7 +1524,11 @@
 			    tmp.innerHTML = "by " + creator;
 			    header.appendChild(tmp);
 			    //body text
-			    body.innerHTML = convertForClient(entry.getElementsByTagName("logbook_entry_text")[0].getAttribute("value"));
+			    body.innerHTML = entryText;
+
+				//condition for condensed-view single line by removing <br>
+				replaceBrWithSpace(body); //to toggle call restoreBr(el)
+
 			    //uploads
 			    var uploadsArr = entry.getElementsByTagName("logbook_entry_file");
 			    if(uploadsArr.length)
@@ -1288,7 +1641,8 @@
 			{
 				Debug.log("Logbook calendar xy " + e.pageX + " - " + e.pageY);
 
-				calendarPopup(e.pageX, e.pageY, calendarHandler);
+				//_refreshDayIndex is days into past, 0 for today
+				calendarPopup(e.pageX, e.pageY, calendarHandler, (new Date()).getTime() - _refreshDayIndex * (1000*60*60*24));
 			} //end showCalendar()
 			
 			//=====================================================================================
@@ -1301,7 +1655,9 @@
 						dateObj.toDateString());
 				
 				//update display with user date
-				var refreshDayIndex = ((((new Date()).getTime())/(1000*60*60*24)) | 0) - userDate;
+				var refreshDayIndex = ((((new Date()).getTime()  + _TIMEZONE_OFFSET_HOURS*1000*60*60 )
+					/ (1000*60*60*24)) | 0) 
+					- userDate;
 				Debug.logv({refreshDayIndex});
 				var displayDate = (dateObj.getMonth()+1) + "/" + dateObj.getDate() + "/" + dateObj.getFullYear();
 								
@@ -1532,15 +1888,20 @@
 				<a href='Javascript:;' onmouseup='refreshLogbook(undefined,1);'>1</a> | 
 				<a href='Javascript:;' onmouseup='refreshLogbook(undefined,2);'>2</a> |
 				<a href='Javascript:;' onmouseup='refreshLogbook(undefined,7);'>7</a> |
+				<a href='Javascript:;' onmouseup='refreshLogbook(undefined,14);'>14</a> |
+				<a href='Javascript:;' onmouseup='refreshLogbook(undefined,30);'>30</a> |
+				<a href='Javascript:;' onmouseup='refreshLogbook(undefined,60);'>60</a> |
 				<a href='Javascript:;' onmouseup='refreshLogbook(undefined,365);'>365</a>
 				days before.
 				<br><br>
 				<a href='Javascript:;' onmouseup='advanceByDays(-1);'>Previous Day</a> |
 				<a href='Javascript:;' onmouseup='advanceByDays(1);'>Next Day</a>			
 			</div>				
-			<div id='generateReport' onmouseup='generateReport();' title='Advanced Logbook Reporting'
+			<!--<div id='generateReport' onmouseup='generateReport();' title='Advanced Logbook Reporting'
 				><img style='margin:-15px 0 0 0' height='48px'
-				src='/WebPath/images/windowContentImages/logbook-report.png'></div>
+				src='/WebPath/images/windowContentImages/logbook-report.png'></div> -->
+			<div id='generateReport' style='float:left'
+			><a id='autoRefreshLink' href="#" onclick="toggleAutoRefresh();" title='Click to toggle auto-refresh enable/disable.'>Auto-refresh is off</a></div>
 			<div id='generateReport' style='float:right' onmouseup='refreshLogbook();' title='Refresh'
 				><img style='margin:-7px 8px 8px 8px' height='32px'
 				src='/WebPath/images/windowContentImages/logbook-refresh.png'></div>
diff --git a/WebGUI/html/MultiSelectBoxTest.html b/WebGUI/html/MultiSelectBoxTest.html
index f4d0768c..bdcfd8f6 100755
--- a/WebGUI/html/MultiSelectBoxTest.html
+++ b/WebGUI/html/MultiSelectBoxTest.html
@@ -25,9 +25,9 @@
 				var noMultiSelect = false; // true or false (false for multiselect functionality) 
 				var maintainPreviousSelections = false; //true or false (true means redraw select box using the js array selects left over from the last time this box was drawn using the same element id)
 				
-				var vals = ["One little piggy","two little piggies","three little piggies"];
-				var keys = ["one","two","three"];
-				var types = ["number","numbers","numbers"];
+				var vals = ["One little piggy","two little piggies","three little piggies"]; //added as display value
+				var keys = ["one","two","three"]; //added to tag as key-value='" + keys[i] + "' 
+				var types = ["number","numbers","numbers"]; //added to tag as type-value=
 									
 				//write to a particular div
 	            var el1 = document.getElementById('box1Div');  
@@ -63,6 +63,7 @@
 	            var selArr = MultiSelectBox.getSelectionArray(el1);
 	            for(var s in selArr)
 	            {
+					//NOTE: Replace MultiSelectBox.dbg with console.log to see printouts (MultiSelectBox.dbg is disabled by default in production mode)
 	                MultiSelectBox.dbg("box 1 selected [" + s + "]: ",
 	                		selArr[s]);
 	                if(selArr[s])
@@ -81,6 +82,7 @@
 	            selArr = MultiSelectBox.getSelectionArray(el2);
 	            for(var s in selArr)
 	            {
+					//NOTE: Replace MultiSelectBox.dbg with console.log to see printouts (MultiSelectBox.dbg is disabled by default in production mode)
 	                MultiSelectBox.dbg("box 2 selected [" + s + "]: ",
 	                		selArr[s]);
 
diff --git a/WebGUI/js/Debug.in.js b/WebGUI/js/Debug.in.js
index e8993e1c..34d420eb 100755
--- a/WebGUI/js/Debug.in.js
+++ b/WebGUI/js/Debug.in.js
@@ -238,6 +238,7 @@ if (Debug.mode) //IF DEBUG MODE IS ON!
 			var argsInStr = arguments.length;
 			if(arguments.length > 1 && 
 					arguments[arguments.length-1] !== undefined &&
+					arguments[arguments.length-1] !== null &&
 					arguments[arguments.length-1].DEBUG_PRIORITY !== undefined)
 			{
 				num = arguments[arguments.length-1].DEBUG_PRIORITY;
diff --git a/WebGUI/js/Desktop.js b/WebGUI/js/Desktop.js
index bcd2116f..e9a67709 100755
--- a/WebGUI/js/Desktop.js
+++ b/WebGUI/js/Desktop.js
@@ -645,7 +645,7 @@ Desktop.createDesktop = function(security) {
 	{		
 		Debug.log(name + " - " + subname + " - " + url + " - " + unique);
 
-		if(name.indexOf("icons loading...") > 0)
+		if(name.indexOf(" loading...") > 0)
 		{
 			Debug.log("Assuming user is trying to reload icons!");
 			
@@ -2854,12 +2854,16 @@ Desktop.logout = function ()
 
 //==============================================================================
 //formatTime ~~
+var monthArr_ = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
 Desktop.formatTime = function(t) 
 {
 	var date = new Date(t * 1000);
 	var mm = date.getMinutes() < 10?"0"+date.getMinutes():date.getMinutes();
-	var ss = date.getSeconds() < 10?"0"+date.getSeconds():date.getSeconds();				
-	return date.getHours() + ":" + mm + ":" + ss;
+	var ss = date.getSeconds() < 10?"0"+date.getSeconds():date.getSeconds();		
+	var m = monthArr_[date.getMonth()]; //+ 1).format("02d");;
+	var d = ('0' + date.getDate()).slice(-2); //zero pad day of month
+	var y = date.getFullYear() - 2000;
+	return d + m + y + "." + date.getHours() + ":" + mm + ":" + ss;
 } //end formatTime()
 
 //==============================================================================
diff --git a/WebGUI/js/DesktopContent.js b/WebGUI/js/DesktopContent.js
index 8526b3d1..66d07a29 100755
--- a/WebGUI/js/DesktopContent.js
+++ b/WebGUI/js/DesktopContent.js
@@ -229,6 +229,7 @@ DesktopContent._mouseMoveSubscribers = [];
 DesktopContent._loginNotifyHandler = undefined; //User code should define this function if action desired when re-login occurs
 
 DesktopContent._pageInitCalled = false;
+DesktopContent._windowMessagingInactive = undefined;
 
 DesktopContent._sequence = 0;
 
@@ -654,7 +655,15 @@ DesktopContent.init = function(onloadFunction)
 
 	//call self in a bit to try init (in case window messaging not active)
 	window.setTimeout(
-		localOnloadHandler,300 /*ms*/);
+		function()
+		{
+			if(!DesktopContent._pageInitCalled)
+			{
+				Debug.log("Perhaps window messaging not active?");
+				DesktopContent._windowMessagingInactive = true;
+			}
+			localOnloadHandler();
+		},300 /*ms*/);
 
 	return;
 
@@ -2344,8 +2353,8 @@ DesktopContent.getColorAsRGBA = function(colorStr)
 
 //=====================================================================================
 //get window and mouse info ~~
-DesktopContent.getWindowWidth = function() { return window.innerWidth-1; } //-1 to avoid weird rounding effects by browser that cause scroll bars
-DesktopContent.getWindowHeight = function() { return window.innerHeight-1; } //-1 to avoid weird rounding effects by browser that cause scroll bars
+DesktopContent.getWindowWidth = function() { return document.documentElement.clientWidth - 1; } //clientWidth excludes the scroll bards... window.innerWidth-1; } //-1 to avoid weird rounding effects by browser that cause scroll bars
+DesktopContent.getWindowHeight = function() { return document.documentElement.clientHeight - 1; } //clientHeight excludes the scroll bards... window.innerHeight-1; } //-1 to avoid weird rounding effects by browser that cause scroll bars
 DesktopContent.getBodyWidth = function() { return document.body.offsetWidth; }
 DesktopContent.getBodyHeight = function() { return document.body.offsetHeight; }
 DesktopContent.getWindowScrollLeft = function() { return document.documentElement.scrollLeft || document.body.scrollLeft || 0; }
diff --git a/WebGUI/js/DesktopIcons.js b/WebGUI/js/DesktopIcons.js
index 92a9f5f4..18e650f2 100755
--- a/WebGUI/js/DesktopIcons.js
+++ b/WebGUI/js/DesktopIcons.js
@@ -223,8 +223,8 @@ else {
       	//	adds an icon subtext wording underneath and image icon (if picfn defined, else alt text icon)
       	this.addIcon = function(subtext, altText, linkurl, uniqueWin, picfn, folderPath) 
       	{
-      	      		
-      		//Debug.log("this.addIcon");
+      	    if(altText == 'X') 		
+      			Debug.log("this.addIcon");
       		      		
       		//same as in DesktopContent.openNewBrowserTab
       		//for linkurl, need to check lid=## is terminated with /
@@ -360,9 +360,14 @@ else {
       		}
       		else
       		{
-				link.addEventListener("click", function(e) {
-					Desktop.desktop.addWindow(subtext,"",linkurl,uniqueWin);
-				}, false);
+				if(altText == 'X' && linkurl == "/") //click unloaded icons to refresh icons
+					link.addEventListener("click", function(e) {
+						Desktop.desktop.addWindow(subtext,"",linkurl,uniqueWin);
+					}, false);
+				else
+					link.addEventListener("click", function(e) {
+						Desktop.desktop.addWindow(subtext,"",linkurl,uniqueWin);
+					}, false);
       		}
 			
       		div = document.createElement("div");
diff --git a/WebGUI/js/DesktopWindow.js b/WebGUI/js/DesktopWindow.js
index ec5ba0a0..1e9a9161 100755
--- a/WebGUI/js/DesktopWindow.js
+++ b/WebGUI/js/DesktopWindow.js
@@ -320,22 +320,19 @@ else {
 		//maximize() ~~~
 		//	maximize window toggle fulls screen mode
 		this.maximize = function() 
-		{
-			 
+		{			 
 			if(_isMinimized) this.unminimize(); //untoggle minimize flag
 			_isMaximized = true;
 			
 			this.windiv.style.display = "inline"; //make sure is visible
 			this.setWindowSizeAndPosition(_x+10,_y,_w,_h);
-			window.parent.document.title= _name;
-			// console.log(document.title, _name, "Maximize()");
-			
+			window.parent.document.title = _name;
+			// console.log(document.title, _name, "Maximize()");			
 		} //end maximize()
 
 		//==============================================================================
 		this.unmaximize = function()
 		{
-
 			_isMaximized = false;
 			
 			this.windiv.style.display = "inline"; //make sure is visible
diff --git a/WebGUI/js/SubsystemLaunch.js b/WebGUI/js/SubsystemLaunch.js
index f49c8fa4..f7cd8386 100755
--- a/WebGUI/js/SubsystemLaunch.js
+++ b/WebGUI/js/SubsystemLaunch.js
@@ -189,6 +189,7 @@ SubsystemLaunch.create = function() {
 			_getStatusTimer = window.setTimeout(getCurrentStatus,1000); //in 1 sec
 
 			redrawWindow();
+			redrawWindow(); //do twice in case of new scroll bars
 
 		} //end localGetContextRecordsHandler()
 				
@@ -710,8 +711,8 @@ SubsystemLaunch.create = function() {
 		//adjust link divs to proper size
 		//	use ratio of new-size/original-size to determine proper size
 
-		var w = window.innerWidth | 0;
-		var h = window.innerHeight | 0;	  
+		var w = DesktopContent.getWindowWidth() | 0;
+		var h = DesktopContent.getWindowHeight() | 0;	  
 
 		if(w < _LAUNCH_MIN_W)
 			w = _LAUNCH_MIN_W;
diff --git a/WebGUI/js/js_lib/CalendarPopup.js b/WebGUI/js/js_lib/CalendarPopup.js
index ea208891..4171f372 100755
--- a/WebGUI/js/js_lib/CalendarPopup.js
+++ b/WebGUI/js/js_lib/CalendarPopup.js
@@ -25,6 +25,11 @@
 //			- override defaults at top of code for personalization
 // ===================================================================
 
+var CalendarPopup = CalendarPopup || {}; //define CalendarPopup namespace
+if(1 && window.console && console && console.log)
+	CalendarPopup.dbg = console.log.bind(window.console);
+else
+	CalendarPopup.dbg = function(){;} //do nothing
 
 //defaults
 //	can be overridden in user code
@@ -62,11 +67,15 @@ var calendarPopup_HANDLER;
 
 /////////////////////////////////////////
 
+//==============================================================================
 //calendarPopup ~
 //	x is integer from left edge of window
 //  y is integer from top edge of window
-function calendarPopup(x, y, calendarHandler) {
-	
+// initDate := int time ==> e.g., parseInt((new Date("Jan 1, 2013")).getTime());
+function calendarPopup(x, y, calendarHandler, initDate) 
+{
+	CalendarPopup.dbg("calendarPopup()");
+
 	calendarPopup_HANDLER = calendarHandler;
 	
 	//remove calendar if already exists
@@ -88,16 +97,17 @@ function calendarPopup(x, y, calendarHandler) {
 	
     document.body.appendChild(el);
         
-    calendarPopupAddHeader();
-    calendarPopupAddMonthNav();
-    calendarPopupAddDates();
+    calendarPopupAddHeader(initDate);
+    calendarPopupAddMonthNav(initDate);
+    calendarPopupAddDates(initDate);
     calendarPopupAddFooter();
-}
+} //end calendarPopup()
 
+//==============================================================================
 //calendarPopupAddHeader
 //	add drop down and month display
-function calendarPopupAddHeader() {
-
+function calendarPopupAddHeader(initDate) 
+{
 	var calEl = document.getElementById(calendarPopup_CALID);
     el = document.createElement("div");
 	el.setAttribute("id", calendarPopup_CALID + "-header");
@@ -125,7 +135,11 @@ function calendarPopupAddHeader() {
 
 	el = document.createElement("option");
 	el.style.color = "black";
-	el.text = "Month";
+
+	var thisDate = initDate?(new Date(initDate)):(new Date());
+	// el.text = "Month";
+	var thisMonth = thisDate.toDateString().split(" ")[1]; //init to this month
+    
 	subCalEl.add(el,null); //insert at end of list
     
     var mDate = parseInt((new Date("Jan 1, 2013")).getTime()); //init to jan, arbitrary year
@@ -134,6 +148,8 @@ function calendarPopupAddHeader() {
         el = document.createElement("option");
     	el.style.color = "black";
     	el.text = (new Date(mDate)).toDateString().split(" ")[1];
+		if(el.text == thisMonth)
+			el.selected = true;
     	subCalEl.add(el,null); //insert at end of list
     }
 
@@ -141,7 +157,7 @@ function calendarPopupAddHeader() {
     el = document.createElement("select");
 	el.setAttribute("id", calendarPopup_CALID + "-yearSelect");
 	el.style.color = "black";
-	el.setAttribute("title", "Select a month from the dropdown");
+	el.setAttribute("title", "Select a year from the dropdown");
 	el.style.margin = "5px";	
 	el.style.cssFloat = "left";
 	el.style.width = 70 + "px";
@@ -151,7 +167,7 @@ function calendarPopupAddHeader() {
 
     el = document.createElement("option");
             
-    var yDate = parseInt((new Date()).getFullYear()); //init to this year
+    var yDate = parseInt(thisDate.getFullYear()); //init to this year
     
     var yMin = parseInt(calendarPopup_MIN_YEAR)?parseInt(calendarPopup_MIN_YEAR):yDate;
     var yMax = parseInt(calendarPopup_MAX_YEAR)?parseInt(calendarPopup_MAX_YEAR):yDate;
@@ -178,19 +194,22 @@ function calendarPopupAddHeader() {
 	
 	el.onmouseup = cancelCalendar;	
 	calEl.appendChild(el);	
-}
+} //end calendarPopupAddHeader()
 
+//==============================================================================
 //cancelCalendar
 //	close calendar do not call handler
-function cancelCalendar() {
+function cancelCalendar()
+{
     var el = document.getElementById(calendarPopup_CALID);
     if(el)
     	el.parentNode.removeChild(el);
-}
+} //end cancelCalendar()
 
+//==============================================================================
 //calendarPopupAddMonthNav
-function calendarPopupAddMonthNav() {
-
+function calendarPopupAddMonthNav(initDate) 
+{
 	var calEl = document.getElementById(calendarPopup_CALID);
 
     el = document.createElement("div");
@@ -223,7 +242,9 @@ function calendarPopupAddMonthNav() {
 	el.setAttribute("id", calendarPopup_CALID + "-monthYearDisplay");
 	el.style.cssFloat = "left";
 	el.style.width = (calendarPopup_W - navW*2 - 20) + "px";
-	var todayArr = (new Date()).toDateString().split(" ");
+
+	var thisDate = initDate?(new Date(initDate)):(new Date());
+	var todayArr = thisDate.toDateString().split(" ");
 	el.innerHTML = todayArr[1] + " " + todayArr[3];  //init to current month
 	el.style.fontWeight = "800";
 	el.style.textAlign = "center";
@@ -250,19 +271,20 @@ function calendarPopupAddMonthNav() {
     el = document.createElement("div");
 	el.setAttribute("id", calendarPopup_CALID + "-currMonth");
 	el.style.display = "none";
-	el.innerHTML = (new Date()).getMonth();  //init to current month
+	el.innerHTML = thisDate.getMonth();  //init to current month
 	calEl.appendChild(el);	
     el = document.createElement("div");
 	el.setAttribute("id", calendarPopup_CALID + "-currYear");
 	el.style.display = "none";
-	el.innerHTML = (new Date()).getFullYear();  //init to current month
+	el.innerHTML = thisDate.getFullYear();  //init to current month
 	calEl.appendChild(el);	
 	
-}
-
+} //end calendarPopupAddMonthNav()
 
+//==============================================================================
 //previousMonth
-function previousMonth() {	
+function previousMonth() 
+{	
 	var el = document.getElementById(calendarPopup_CALID + "-currMonth");
 	var newMo = parseInt(el.innerHTML)-1;  //subtract 1 from month (0-11)
 	var yel = document.getElementById(calendarPopup_CALID + "-currYear");
@@ -276,10 +298,12 @@ function previousMonth() {
 	var dayArr = (new Date(yel.innerHTML,newMo,1)).toDateString().split(" ");	
 	el.innerHTML = dayArr[1] + " " + dayArr[3]; //display updated month	
 	redrawDates();
-}
+} //end previousMonth()
 
+//==============================================================================
 //nextMonth
-function nextMonth() {
+function nextMonth() 
+{
 	var el = document.getElementById(calendarPopup_CALID + "-currMonth");	
 	var newMo = parseInt(el.innerHTML)+1;  //add 1 from month (0-11)
 	var yel = document.getElementById(calendarPopup_CALID + "-currYear");
@@ -293,10 +317,12 @@ function nextMonth() {
 	var dayArr = (new Date(yel.innerHTML,newMo,1)).toDateString().split(" ");		
 	el.innerHTML = dayArr[1] + " " + dayArr[3]; //display updated month	
 	redrawDates();	
-}
+} //end nextMonth()
 
+//==============================================================================
 //calendarPopupAddDates
-function calendarPopupAddDates() {
+function calendarPopupAddDates(initDate) 
+{
 	var calEl = document.getElementById(calendarPopup_CALID);
 	
     el = document.createElement("div");
@@ -340,17 +366,20 @@ function calendarPopupAddDates() {
 		calEl.appendChild(el);
 	}
 		
-	redrawDates(); 
-}
+	redrawDates(initDate); 
+} //end calendarPopupAddDates()
 
+//==============================================================================
 //calendarPopupAddFooter
-function calendarPopupAddFooter() {
-
+function calendarPopupAddFooter() 
+{
 	var calEl = document.getElementById(calendarPopup_CALID);
-}
+} //end calendarPopupAddFooter()
 
+//==============================================================================
 //redrawDates
-function redrawDates() {
+function redrawDates(initDate) 
+{
 	var calEl = document.getElementById(calendarPopup_CALID + "-dates");
 	calEl.innerHTML = ""; //clear old dates
 	
@@ -370,9 +399,10 @@ function redrawDates() {
 	var x = 0, y = 0;
 	var firstMargin = parseInt((calendarPopup_W - w*7)/2); //acount for fractional acccumulation of error
 
-	var todayDate = (new Date()).getDate(); //to color today
-	var todayMonth = (new Date()).getMonth(); //to color today
-	var todayYear = (new Date()).getFullYear(); //to color today
+	var thisDate = initDate?(new Date(initDate)):(new Date());
+	var todayDate = thisDate.getDate(); //to color today
+	var todayMonth = thisDate.getMonth(); //to color today
+	var todayYear = thisDate.getFullYear(); //to color today
 	for(var i=0;i<7*6;++i, day = new Date(day.getTime() + 1000*60*60*24)) //draw dates, day by day
 	{
 	    el = document.createElement("div");
@@ -411,12 +441,13 @@ function redrawDates() {
 	}
 
 	head.appendChild(style);
-}
-
+} //end redrawDates()
 
+//==============================================================================
 //handleSelection
 //	handle selection change from month or year drop down
-function handleSelection() {
+function handleSelection() 
+{
 	var el = document.getElementById(calendarPopup_CALID + "-monthSelect");
 	var newMo = el.value;
 	el = document.getElementById(calendarPopup_CALID + "-monthYearDisplay");	//display updated month	
@@ -433,12 +464,14 @@ function handleSelection() {
 	el.innerHTML = newMo;
 	
 	redrawDates(); 
-}
+} //end handleSelection()
 
-function selectDate() {
+//==============================================================================
+function selectDate() 
+{
 	calendarPopup_HANDLER(parseInt(this.id.split("-")[2])+1); //pass days since Jan 1, 1970
 	cancelCalendar();
-}
+} //end selectDate()
 
 
 
diff --git a/WebGUI/js/js_lib/MultiSelectBox.js b/WebGUI/js/js_lib/MultiSelectBox.js
index 3097498b..32936549 100755
--- a/WebGUI/js/js_lib/MultiSelectBox.js
+++ b/WebGUI/js/js_lib/MultiSelectBox.js
@@ -304,6 +304,11 @@ MultiSelectBox.createSelectBox = function(el,name,title,vals,keys,types,
 	{ MultiSelectBox.dbg("Invalid Element given to MultiSelectBox: " + el);
 		throw new Error("Invalid Element given to MultiSelectBox: " + el); return; } 
 	
+	console.log("el.style.width", el.style.width);
+	console.log("el.offsetWidth", el.offsetWidth);
+	if(! el.offsetWidth)
+		el.style.width = "400px";
+
 	el.innerHTML = ""; //delete current contents
 
 	name = "selbox-" + name;
@@ -522,47 +527,10 @@ MultiSelectBox.showSearch = function(boxid)
 		var selRect = $(boxid).getBoundingClientRect();
 
 		searchBox.style.position="absolute";
-		searchBox.style.top=(offsety)+"px";
-		searchBox.style.left=(offsetx)+"px";
+		searchBox.style.top=(offsety+margin)+"px";
+		searchBox.style.left=(offsetx+margin)+"px";
 		searchBox.style.width=(selRect.width-margin*2-30)+"px";//(selRect.width-margin*2-14)+"px";
-		
-	// 	//finding the search input's offset parent is not so straight forward
-	// 	//	since it is initially hidden.
-	// 	//	Use the offset parent of the content table
-	// 	//		sibling[0] := div (of content)
-	// 	//			withing div, child[0] := header, child[1] := table (of content) 
-
-	// 	var selRect = $(boxid).getBoundingClientRect();
-	// 	//table is position:relative.. so go into a child and get offset parent
-	// 	var searchOffsetParent = $(boxid).offsetParent; //get table parent
-	// 		//searchBox.parentElement.children[0].children[1].children[0].offsetParent;
-	// 	//check if there is no offset parent (the body is the offset parent)
-	// 	//	it seems to be the case that body returns a crazy bounding client rect (left = 8 and top = 13?) .. don't understand why
-	// 	var searchOffsetParentIsBody = searchOffsetParent == document.body;
-
-	// 	var offsetRect = 
-	// 	{"left": searchOffsetParentIsBody?0:
-	// 			searchOffsetParent.getBoundingClientRect().left,	//offsetLeft is different
-	// 			"top": searchOffsetParentIsBody?0:
-	// 					searchOffsetParent.getBoundingClientRect().top
-	// 	};
-	// 	//previous attempts to place search input (all fail to solve all cases): 
-	// 	//MultiSelectBox.omnis_[id].getBoundingClientRect();
-	// 	//select.offsetParent.getBoundingClientRect();
-
-	// 	// var offsetx = selRect.left - offsetRect.left,
-	// 	// 		offsety = selRect.top - offsetRect.top;
-
-	// 	var offsetx = offsetRect.left,
-	// 		offsety = offsetRect.top;
-
-	// 	var margin = 5;
-
-	// 	searchBox.style.position="absolute";
-	// 	searchBox.style.top=(offsety)+"px";
-	// 	searchBox.style.left=(offsetx)+"px";
-	// 	searchBox.style.width=(selRect.width-margin*2-30)+"px";
-	// 	//searchBox.style.display = "block"; //for debugging position
+
 	} //end localPlaceSearchBox()
 	
 	if(!MultiSelectBox.selInitBoxHeight_[boxid])	//init if not yet defined
@@ -669,35 +637,7 @@ MultiSelectBox.performSearchSelect = function(id,el,altstr)
 } //end performSearchSelect()
 
 MultiSelectBox.makeSearchBar = function(id)
-{
-	//remove old existing search bars
-	
-	// var el;
-	// while(el = document.getElementById(id + "search"))
-	// 	el.parentNode.removeChild(el);					
-	
-	// var searchBox=document.createElement("input");
-	// var onchange='MultiSelectBox.searchSelect("' + id + '",this)';
-	
-	// searchBox.setAttribute( "class","hidden");
-	// searchBox.setAttribute( 'type','text');
-	// searchBox.setAttribute( 'id',id + "search");
-	// searchBox.setAttribute( "onpaste"   , onchange);
-	// searchBox.setAttribute( "oncut"     , onchange);
-	// searchBox.setAttribute( "onkeydown" , onchange);
-	// searchBox.setAttribute( "onkeyup"   , onchange);
-	// searchBox.setAttribute( "onkeypress", onchange);
-	// searchBox.setAttribute( "onselect"  , onchange);
-	
-
-	// var searchErrBox=document.createElement("div");
-	
-	// searchErrBox.setAttribute( "class","hidden");
-	// searchErrBox.setAttribute( 'id',id + "searchErr");
-	// searchErrBox.style.color="red";
-	// searchErrBox.style.overflow="hidden";
-	// searchErrBox.style.height="23px";
-	
+{	
 	var interval;
 	function addSearchBox()
 	{
@@ -707,18 +647,6 @@ MultiSelectBox.makeSearchBar = function(id)
 			if(!MultiSelectBox.mySelects_[id])
 				MultiSelectBox.mySelects_[id] = []; //initialize to empty the selected items
 			
-			
-			
-			//err box no longer displayed...
-			//			searchErrBox.style.position="absolute"; //place above title
-			//			searchErrBox.style.top=(offsety - 37)+"px";
-			//			searchErrBox.style.left=(offsetx + 0)+"px";
-			
-			
-			// MultiSelectBox.omnis_[id].appendChild(searchBox);			
-			// MultiSelectBox.omnis_[id].appendChild(searchErrBox);
-			
-			
 			clearInterval(interval);
 		}
 	}
diff --git a/otsdaq-utilities/ECLWriter/ECLConnection.h b/otsdaq-utilities/ECLWriter/ECLConnection.h
index c6d9c046..b1a63f30 100644
--- a/otsdaq-utilities/ECLWriter/ECLConnection.h
+++ b/otsdaq-utilities/ECLWriter/ECLConnection.h
@@ -20,6 +20,7 @@ class ECLConnection
 	ECLConnection(std::string user, std::string password, std::string url);
 	~ECLConnection(){};
 
+	const std::string& getSafeURL(void) const { return _safe_url; }
 	bool Post(ECLEntry_t& e);
 	bool Get(std::string, std::string&);
 	bool Search(std::string);
diff --git a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
index 0063a738..bc05a747 100644
--- a/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
+++ b/otsdaq-utilities/ECLWriter/ECLSupervisor.cc
@@ -33,6 +33,8 @@ using namespace ots;
 #define XML_CATEGORY_ROOT "categories"
 #define XML_CATEGORY "category"
 #define XML_ACTIVE_CATEGORY "active_category"
+#define XML_SAFE_URL "ecl_url"
+#define XML_RESPONSE_CATEGORY "response_category"
 #define XML_CATEGORY_CREATE "create_time"
 #define XML_CATEGORY_CREATOR "creator"
 
@@ -270,17 +272,19 @@ void ECLSupervisor::request(const std::string&               requestType,
 		// returns logbook for currently active category based on date and duration
 		// parameters
 
-		std::string Date     = CgiDataUtilities::postData(cgiIn, "Date");
-		std::string Duration = CgiDataUtilities::postData(cgiIn, "Duration");
+		std::string Date     		= CgiDataUtilities::postData(cgiIn, "Date");
+		uint32_t Duration 			= CgiDataUtilities::postDataAsInt(cgiIn, "Duration");
+		std::string CategoryFilter 	= CgiDataUtilities::postData(cgiIn, "CategoryFilter");
+		
+		__COUTV__(CategoryFilter);
 
 		time_t        date;
-		unsigned char duration;
 		sscanf(Date.c_str(), "%li", &date);           // scan for unsigned long
-		sscanf(Duration.c_str(), "%hhu", &duration);  // scan for unsigned char
 
-		__COUT__ << "date " << date << " duration " << (int)duration << std::endl;
+		__COUT__ << "date " << date << " duration " << Duration << std::endl;
 		std::stringstream str;
-		refreshLogbook(date, duration, &xmlOut, (std::ostringstream*)&str);
+		refreshLogbook(date, Duration, &xmlOut, (std::ostringstream*)&str, 
+			StringMacros::decodeURIComponent(CategoryFilter));
 		__COUT__ << str.str() << std::endl;
 	}
 	// else if(requestType == "PreviewEntry")
@@ -415,7 +419,10 @@ void ECLSupervisor::getCategories(HttpXmlDocument* xmlOut, std::ostringstream* o
 	// expXml.getAllMatchingValues(XML_CATEGORY, exps);
 
 	if(xmlOut)
+	{
 		xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, ECLCategory_);
+		xmlOut->addTextElementToData(XML_SAFE_URL, eclConn_->getSafeURL());		
+	}
 
 	for(unsigned int i = 0; i < exps.size(); ++i)  // loop categories
 	{
@@ -431,7 +438,7 @@ void ECLSupervisor::getCategories(HttpXmlDocument* xmlOut, std::ostringstream* o
 //		if category exists, set as active
 //		to clear active category set to ""
 void ECLSupervisor::webUserSetActiveCategory(std::string      category,
-                                                   HttpXmlDocument* xmlOut)
+											 HttpXmlDocument* xmlOut)
 {
 	// no check, just set
 	ECLCategory_ = category;
@@ -448,10 +455,10 @@ void ECLSupervisor::webUserSetActiveCategory(std::string      category,
 //		e.g. date = today, and duration = 1 returns logbook for today from active
 // category 		The entries are returns from oldest to newest
 void ECLSupervisor::refreshLogbook(	time_t              date,
-									unsigned char       duration,
+									size_t		        duration,
 									HttpXmlDocument*    xmlOut,
 									std::ostringstream* out,
-									std::string         category)
+									std::string		    categoryFilter)
 {
 	if(ECLUser_ == "" || ECLHost_ == "") //ignore ECL when environment variables are not set
 	{
@@ -459,11 +466,12 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 		__SS_THROW__;
 	}
 
-	if(category == "")
-		category = ECLCategory_;  // default to active category
-	if(xmlOut) xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, category);  // for success
+	if(categoryFilter == "")
+		categoryFilter = ECLCategory_;  // default to active category
+	if(xmlOut) xmlOut->addTextElementToData(XML_ACTIVE_CATEGORY, ECLCategory_);  // for success
+	if(xmlOut) xmlOut->addTextElementToData(XML_RESPONSE_CATEGORY, categoryFilter);  // for success
 
-	time_t mostRecentTime = 0;
+	int64_t mostRecentTime = 0;
 	time_t baseTime;
 
 	__COUTTV__(date);
@@ -474,24 +482,77 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 	
 	if(0) //test xml_get
 	{
-		std::string response, url = "/E/xml_get?e=" + std::string("2502"); 
-		//ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
+		std::string response, url = "/E/xml_get?e=" + std::string("1843"); 
+		__COUTV__(url);
+		eclConn_->Get(url,response);
+		__COUTV__(response);
+	}
+	if(0) //test xml_search
+	{
+		std::string response, url = "/E/xml_search?l=5"; //limit to 5  
+		// url += "&c=Facilities / Building";
+		__COUTV__(url);
+		eclConn_->Get(url,response);
+		__COUTV__(response);
+	}
+	if(0) //test xml_search
+	{
+		std::string response, url = "/E/xml_search?l=5"; //limit to 5  
+		url += "&c=" + 
+			StringMacros::encodeURIComponent("Facilities / Building");  //category
+		__COUTV__(url);
+		eclConn_->Get(url,response);
+		__COUTV__(response);
+	}
+	if(0) //test xml_search
+	{
+		std::string response, url = "/E/xml_search?l=5"; //limit to 5  
+		url += "&c=" + 
+			StringMacros::encodeURIComponent("Facilities &#46 Building");  //category
+		__COUTV__(url);
 		eclConn_->Get(url,response);
 		__COUTV__(response);
 	}
 	
 	//add all posts that match date/duration criteria
 	{
-		__COUTTV__(category);	
-		std::string response, url = "/E/xml_search?l=100&c=" + //limit to 100 
-			StringMacros::encodeURIComponent(category);  //category
-			// "&a=" + std::to_string(duration) + "days" + //after
-			// "&b=" + baseTimeTmBuffer; //before
+		__COUTTV__(categoryFilter);	
+		std::string response, url = "/E/xml_search?"; //l=100"; //limit to 100  
+									// "&a=" + std::to_string(duration) + "days" + //after
+									// "&b=" + baseTimeTmBuffer; //before
+		
+		bool applyCategoryFilter = false;
+		bool applyInvertedCategoryFilter = false;
+		std::vector<std::string> acceptCategories;
+		//filter can start with * for all, or with ! for inverted selection (i.e. all without certain categories)
+		if(categoryFilter.size() && categoryFilter[0] != '*' && categoryFilter[0] != '!' && categoryFilter.find(',') == std::string::npos && 
+				categoryFilter.find(" / ") == std::string::npos)
+			url += "l=100&c=" + StringMacros::encodeURIComponent(categoryFilter);  //category
+		else
+		{
+			if(duration > 14)
+				url += "l=1000"; //get more so better chance to find in filter
+			else 
+				url += "l=300"; //get more so better chance to find in filter
+
+			applyCategoryFilter = (categoryFilter.size() && categoryFilter[0] != '*')?true:false;
+			applyInvertedCategoryFilter = (categoryFilter.size() && categoryFilter[0] == '!')?true:false;
+			if(applyCategoryFilter)
+			{
+				if(applyInvertedCategoryFilter) //skip 1st char
+					acceptCategories = StringMacros::getVectorFromString(categoryFilter.substr(1));
+				else
+					acceptCategories = StringMacros::getVectorFromString(categoryFilter);
+				__COUTTV__(StringMacros::vectorToString(acceptCategories));
+			}			
+			__COUTTV__(applyInvertedCategoryFilter);
+			__COUTTV__(applyCategoryFilter);
+		}
 		
 		//apply date range		
 		{
 			__COUTTV__(baseTime);
-			__COUTTV__((size_t)duration);
+			__COUTTV__(duration);
 
 			if(TTEST(30)) //debug date
 			{			
@@ -570,7 +631,7 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 		//  </XML_LOGBOOK_ENTRY>
 
 		std::string id, author, subject, category, timestamp, files, images, text;
-		size_t after = 0, before = -1, entryCount = 0;
+		size_t after = 0, before = -1, entryCount = 0, lastBefore = -1;
 		std::tm tm;
 		std::string preText, postText;
 
@@ -589,6 +650,28 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 				"subject=", "\"");
 			category = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
 				"category=", "\"");				
+
+
+			if(applyCategoryFilter)
+			{
+				bool found = applyInvertedCategoryFilter;				
+				for(const auto& acceptCategory : acceptCategories)
+					if(category == acceptCategory || 
+						category.find(acceptCategory + "/") != std::string::npos)
+						{
+							found = !applyInvertedCategoryFilter;
+							break;
+						}
+
+				if(!found)
+				{
+					__COUT_TYPE__(TLVL_DEBUG+10) << __COUT_HDR__ << "Skipping unaccepted category: " << category << __E__;
+					lastBefore = before;
+					--before; //move back to prepare for next search
+					continue;
+				}
+			}
+
 			timestamp = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
 				"timestamp=", "\"");		
 			images = StringMacros::extractXmlField(response, "entry", 0, after, nullptr, 
@@ -603,31 +686,39 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 			ss >> std::get_time(&tm, "%m/%d/%Y %H:%M:%S"); // Parse the string into the tm structure			
 			time_t t = std::mktime(&tm); // Convert tm structure to time_t
 
+			__COUTVS__(2,t);	
+			__COUTVS__(2,mostRecentTime);	
 			if(!date && t > mostRecentTime)
 				mostRecentTime = t; //track most recent entry
+			__COUTVS__(2,mostRecentTime);	
 
-			text = StringMacros::extractXmlField(response, "pre class=\"html_safe_entry\"", 0, after, nullptr, 
+			size_t foundTextPos;
+			text = StringMacros::extractXmlField(response, "pre class=\"html_safe_entry\"", 0, after, &foundTextPos, 
 				"", ">");
 			__COUTVS__(2,text.size());
-			if(text.size() == 0)
+			if(text.size() == 0 || //if not found
+				foundTextPos > lastBefore) //or found in different entry!
 			{
 				text = StringMacros::extractXmlField(response, "text", 0, after, nullptr, 
 					"", ">");
 				__COUTVS__(2,text.size());
 			}
-			__COUTVS__(2,text);	
+			__COUTVS__(3,text);	
+			if(text.size() > std::string("Message: &#010;").size() && 
+				text[0] == 'M' && text[6] == 'e' && text[7] == ':' && text[9] == '&' && text[10] == '#')
+				text = text.substr(std::string("Message: &#010;").size()); //skip Message header
 
 			preText = ""; postText = "";
 			bool needAttachments = false;
 			if(atoi(images.c_str()))
 			{
 				needAttachments = true;
-				preText += "Attached Images: " + images + "\n<br>";
+				preText += "Attached Images: " + images + "<br>";
 			}
 			if(atoi(files.c_str()))
 			{
 				needAttachments = true;
-				preText += "Attached Files: " + files + "\n<br>";
+				preText += "Attached Files: " + files + "<br>";
 			}
 
 			if(needAttachments)
@@ -635,27 +726,99 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 				std::string response, url = "/E/xml_get?e=" + id;
 				// ECLConnection eclConn(ECLUser_, ECLPwd_, ECLHost_);
 				eclConn_->Get(url,response);
-				__COUTV__(response);
+				__COUTVS__(3,response);
 
 				size_t fileCount = atoi(files.c_str());
 				__COUTV__(fileCount);
+				size_t attachmentAfter = 0;
+
+				if(fileCount) postText += "<br><br>=====> Attached Files:";
 				for(size_t j=0;j<fileCount;++j)
 				{
+					__COUTTV__(attachmentAfter);
 					std::string furl = 
-						StringMacros::extractXmlField(response, "attachment", 0, after, nullptr, 
+						StringMacros::extractXmlField(response, "attachment", 0, attachmentAfter, &attachmentAfter, 
 							"url=", "\"");
 					
 					__COUTVS__(2,furl);	
 					std::string fname = 
-						StringMacros::extractXmlField(response, "attachment", 0, after, nullptr, 
+						StringMacros::extractXmlField(response, "attachment", 0, attachmentAfter, nullptr, 
+							"filename=", "\"");
+					
+					__COUTVS__(2,fname);		
+					postText += "<br>";
+					if(fileCount > 1)
+						postText += "Attached File #" + std::to_string(j+1) + ": ";
+					postText += "<a target='_blank' href='" + furl + "'>" + fname + "</a>";
+					attachmentAfter += 20; //advance to next
+				}
+
+				size_t imageCount = atoi(images.c_str());
+				__COUTVS__(3,imageCount);
+				attachmentAfter = 0;
+				if(imageCount) postText += "<br><br>=====> Attached Images:";
+				for(size_t j=0;j<imageCount;++j)
+				{
+					__COUTTV__(attachmentAfter);
+					attachmentAfter = response.find("type=\"image\"",attachmentAfter);
+					if(attachmentAfter == std::string::npos) break;
+					attachmentAfter = response.rfind("<attachment",attachmentAfter);
+					if(attachmentAfter == std::string::npos) break;
+
+					std::string furl = 
+						StringMacros::extractXmlField(response, "attachment", 0, attachmentAfter, nullptr, 
+							"full_url=", "\"");
+					
+					__COUTVS__(2,furl);	
+					std::string fname = 
+						StringMacros::extractXmlField(response, "attachment", 0, attachmentAfter, nullptr, 
 							"filename=", "\"");
 					
 					__COUTVS__(2,fname);		
-					postText += "<br><a href='" + furl + "'>" + fname + "</a>";																												
+					postText += "<br>";
+					if(imageCount > 1) 
+						postText += "Attached Image #" + std::to_string(j+1) + ": ";
+					postText += "<a target='_blank' href='" + furl + "'>" + fname + "</a>";
+
+					attachmentAfter += 50; //advance to next
 				}
 			} //end attachment handling
 
-			text = preText + (preText.size()?"\n<br>":"") + text + postText;
+
+			// Lambda function to wrap links
+			auto wrapLinks = [](const std::string& inputText) -> std::string {
+				std::string result;
+				std::string::size_type pos = 0;
+				std::string::size_type start;
+
+				while ((start = inputText.find("http://", pos)) != std::string::npos ||
+					(start = inputText.find("https://", pos)) != std::string::npos) {
+					// Append text before the link
+					result.append(inputText, pos, start - pos);
+
+					// Find the end of the URL (stop at space or end of string)
+					std::string::size_type end = inputText.find_first_of(" \t\n!<>(),\"\'", start);
+					if (end == std::string::npos) {
+						end = inputText.size();
+					}
+
+					// Extract the URL
+					std::string url = inputText.substr(start, end - start);
+
+					// Append the <a> tag
+					result += "<a href=\"" + url + "\" target=\"_blank\">" + url + "</a>";
+
+					// Move position to after the URL
+					pos = end;
+				}
+
+				// Append any remaining text
+				result.append(inputText, pos, inputText.size() - pos);
+
+				return result;
+			};
+			
+			text = preText + (preText.size()?"\n<br>":"") + wrapLinks(text) + postText;
 			__COUTVS__(2,text);	
 
 			if(xmlOut)
@@ -671,6 +834,7 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 					" - entry #" + id + " - " + subject, entryParent);
 			}
 
+			lastBefore = before;
 			--before; //move back to prepare for next search
 			// after += std::string("entry").size(); //move forward to prepare for next search
 			
@@ -693,26 +857,28 @@ void ECLSupervisor::refreshLogbook(	time_t              date,
 			__COUTT__ << "i: " << i << " " << ((time(0) - i*60*60 + timezoneHourOffset_*60*60)/(60 * 60 * 24));
 	}
 
-	if(xmlOut && mostRecentTime)
+	if(xmlOut)
 	{
-		size_t mostRecentDayIndex = (mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24);
-		size_t nowDayIndex = (time(0) + timezoneHourOffset_*60*60)/(60 * 60 * 24);		
-		if(TTEST(30))
+		xmlOut->addNumberElementToData(XML_TIMEZONE_OFFSET, timezoneHourOffset_); 
+
+		if(0 && mostRecentTime) //always return 0 for ECL, because category filter may change, and may want live view of today..
 		{
-			__COUTTV__(mostRecentDayIndex);
-			__COUTTV__(nowDayIndex);
-			__COUTTV__(mostRecentTime);
-			__COUTTV__(((time(0) - mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24)));			
+			int64_t mostRecentDayIndex = (mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24);
+			int64_t nowDayIndex = (time(0) + timezoneHourOffset_*60*60)/(60 * 60 * 24);		
+			if(TTEST(30))
+			{
+				__COUTTV__(mostRecentDayIndex);
+				__COUTTV__(nowDayIndex);
+				__COUTTV__(mostRecentTime);
+				__COUTTV__(((time(0) - mostRecentTime + timezoneHourOffset_*60*60)/(60 * 60 * 24)));			
+			}
+			__COUTTV__(nowDayIndex - mostRecentDayIndex);
+			xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, //0 is today
+						nowDayIndex - mostRecentDayIndex);  // send most recent day index found in response
 		}
-		__COUTTV__(nowDayIndex - mostRecentTime);
-		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, //0 is today
-					nowDayIndex - mostRecentTime);  // send most recent day index found in response
-	}
-	else 
-		xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, 0); //0 is today
-
-	
-	xmlOut->addNumberElementToData(XML_TIMEZONE_OFFSET, timezoneHourOffset_); 
+		else
+			xmlOut->addNumberElementToData(XML_MOST_RECENT_DAY, 0); 
+	}	
 	
 } //end refreshLogbook()
 
diff --git a/otsdaq-utilities/ECLWriter/ECLSupervisor.h b/otsdaq-utilities/ECLWriter/ECLSupervisor.h
index af45ed09..2eb3a638 100644
--- a/otsdaq-utilities/ECLWriter/ECLSupervisor.h
+++ b/otsdaq-utilities/ECLWriter/ECLSupervisor.h
@@ -69,19 +69,19 @@ class ECLSupervisor : public CoreSupervisorBase
   private:
 
 	void        							getCategories					(HttpXmlDocument* xmldoc = 0, std::ostringstream* out = 0);
-	void 									webUserSetActiveCategory		(std::string experiment, HttpXmlDocument* xmldoc = 0);
+	void 									webUserSetActiveCategory		(std::string category, HttpXmlDocument* xmldoc = 0);
 	void 									refreshLogbook					(time_t              date,
-	     								              						 unsigned char       duration,
+	     								              						 size_t		         duration,
 	     								              						 HttpXmlDocument*    xmldoc     = 0,
 	     								              						 std::ostringstream* out        = 0,
-	     								              						 std::string         experiment = "");
+	     								              						 std::string  		 categoryFilter = "");
 
 	std::string                           	ECLUser_;
 	std::string                           	ECLHost_;
 	std::string                           	ECLPwd_;
 	std::string                           	ECLCategory_;
 	std::string                           	CategoryName_;
-	size_t									timezoneHourOffset_ = 0;
+	int64_t									timezoneHourOffset_ = 0;
 
 	std::unique_ptr<ECLConnection>			eclConn_;
 
diff --git a/otsdaq-utilities/Logbook/LogbookSupervisor.cc b/otsdaq-utilities/Logbook/LogbookSupervisor.cc
index 8e2c0c8d..ceded2a0 100644
--- a/otsdaq-utilities/Logbook/LogbookSupervisor.cc
+++ b/otsdaq-utilities/Logbook/LogbookSupervisor.cc
@@ -361,16 +361,14 @@ void LogbookSupervisor::request(const std::string&               requestType,
 		// parameters
 
 		std::string Date     = CgiDataUtilities::postData(cgiIn, "Date");
-		std::string Duration = CgiDataUtilities::postData(cgiIn, "Duration");
+		uint32_t Duration 	 = CgiDataUtilities::postDataAsInt(cgiIn, "Duration");
 
 		time_t        date;
-		unsigned char duration;
 		sscanf(Date.c_str(), "%li", &date);           // scan for unsigned long
-		sscanf(Duration.c_str(), "%hhu", &duration);  // scan for unsigned char
 
-		__COUT__ << "date " << date << " duration " << (int)duration << std::endl;
+		__COUT__ << "date " << date << " duration " << Duration << std::endl;
 		std::stringstream str;
-		refreshLogbook(date, duration, &xmlOut, (std::ostringstream*)&str);
+		refreshLogbook(date, Duration, &xmlOut, (std::ostringstream*)&str);
 		__COUT__ << str.str() << std::endl;
 	}
 	else if(requestType == "PreviewEntry")
@@ -944,7 +942,7 @@ void LogbookSupervisor::removeCategory(std::string      category,
 //		e.g. date = today, and duration = 1 returns logbook for today from active
 // category 		The entries are returns from oldest to newest
 void LogbookSupervisor::refreshLogbook(time_t              date,
-                                       unsigned char       duration,
+                                       uint32_t		       duration,
                                        HttpXmlDocument*    xmlOut,
                                        std::ostringstream* out,
                                        std::string         category)
@@ -1035,7 +1033,7 @@ void LogbookSupervisor::refreshLogbook(time_t              date,
 	// read all days selected out
 	//	entries are in file as oldest at top, newest at bottom
 	//	so read oldest files first to have global ordering of old to new
-	for(unsigned char i = duration; i != 0; --i)
+	for(uint32_t i = duration; i != 0; --i)
 	{
 		sprintf(dayIndexStr, "%6.6u", baseDay - i + 1);  // get day index, back in time
 		entryPath = dirPath + "/" + LOGBOOK_FILE_PREFACE + category + "_" +
diff --git a/otsdaq-utilities/Logbook/LogbookSupervisor.h b/otsdaq-utilities/Logbook/LogbookSupervisor.h
index 11e296f9..a32d5769 100644
--- a/otsdaq-utilities/Logbook/LogbookSupervisor.h
+++ b/otsdaq-utilities/Logbook/LogbookSupervisor.h
@@ -48,7 +48,7 @@ class LogbookSupervisor : public CoreSupervisorBase
 	void        						getCategories					(HttpXmlDocument* xmldoc = 0, std::ostringstream* out = 0);
 	void 								webUserSetActiveCategory		(std::string category, HttpXmlDocument* xmldoc = 0);
 	void 								refreshLogbook					(time_t              date,
-	     								              					 unsigned char       duration,
+	     								              					 uint32_t		     duration,
 	     								              					 HttpXmlDocument*    xmldoc     = 0,
 	     								              					 std::ostringstream* out        = 0,
 	     								              					 std::string         category = "");