update www

gbook · Jun 7, 2024 · ccf8539 · ccf8539
1 parent bec355a
commit ccf8539
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/src/web/packages.php b/src/web/packages.php
@@ -70,6 +70,7 @@
 	$subjectids = GetVariable("subjectids");
 	$studyids = GetVariable("studyids");
 	$seriesids = GetVariable("seriesids");
+	$seriesid = GetVariable("seriesid"); /* from the search page this variable is 'seriesid', but will contain multiple values */
 	$experimentids = GetVariable("experimentids");
 	$analysisids = GetVariable("analysisids");
 	$pipelineids = GetVariable("pipelineids");
@@ -84,6 +85,10 @@
 
 	if (count($seriesids) > 0)
 		$objectids = $seriesids;
+	if (count($seriesid) > 0)
+		$objectids = $seriesid;
+
+	//PrintVariable($objectids);
 
 	/* determine action */
 	if ($selfcall) {
@@ -137,11 +142,19 @@
 	/* -------------------------------------------- */
 	function AddObjectForm($objecttype, $objectids, $modality) {
 
+		//PrintVariable($objecttype);
+		//PrintVariable($objectids);
+		//PrintVariable($modality);
+
 		/* perform data checks */
 		$objecttype = mysqli_real_escape_string($GLOBALS['linki'], $objecttype);
 		$objectids = mysqli_real_escape_array($GLOBALS['linki'], $objectids);
 		$modality = mysqli_real_escape_string($GLOBALS['linki'], $modality);
 
+		//PrintVariable($objecttype);
+		//PrintVariable($objectids);
+		//PrintVariable($modality);
+
 		switch ($objecttype) {
 			case "enrollment":
 				DisplayAddEnrollmentForm($objectids);
@@ -412,7 +425,10 @@ function DisplayAddStudyForm($studyids) {
 	/* -------------------------------------------- */
 	function DisplayAddSeriesForm($seriesids, $modality) {
 
-		if (count($seriesids < 1)) {
+		//PrintVariable($seriesids);
+		//PrintVariable($modality);
+
+		if (count($seriesids) < 1) {
 			Error("0 seriesids passed into function");
 			return;
 		}
@@ -421,15 +437,19 @@ function DisplayAddSeriesForm($seriesids, $modality) {
 
 		/* get subject info. there may be series from multiple subjects in this list */
 		$sqlstring = "select * from $modality" . "_series a left join studies b on a.study_id = b.study_id left join enrollment c on b.enrollment_id = c.enrollment_id left join subjects d on c.subject_id = d.subject_id where a.$modality" . "series_id in (" . $seriesidstr . ")";
+		PrintSQL($sqlstring);
 		$result = MySQLiQuery($sqlstring, __FILE__, __LINE__);
 		$numseries = mysqli_num_rows($result);
 		while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+			//echo "Hello";
 			$enrollmentids[] = $row['enrollment_id'];
 			$subjectids[] = $row['subject_id'];
 			$studyids[] = $row['study_id'];
 			$projectids[] = $row['project_id'];
-			if ($row[$modality . '_seriesid'] != "")
-				$seriesids2[$modality][] = $row[$modality . '_seriesid'];
+			//echo $modality . "series_id";
+			//echo $row[$modality . "series_id"];
+			if ($row[$modality . "series_id"] != "")
+				$seriesids2[$modality][] = $row[$modality . 'series_id'];
 
 			if (trim($row['series_desc']) == "")
 				$seriesdesc = $row['series_protocol'];
@@ -477,6 +497,8 @@ function DisplayAddSeriesForm($seriesids, $modality) {
 		}
 		$experimentids = array_unique($experimentids);
 
+		//PrintVariable($seriesids2);
+
 		?>
 
 		<div class="ui container">
@@ -490,7 +512,7 @@ function DisplayAddSeriesForm($seriesids, $modality) {
 					<br>
 					<? DisplayFormStudies($studyids, true); ?>
 					<br>
-					<? DisplayFormSeries($seriesids, true); ?>
+					<? DisplayFormSeries($seriesids2, true); ?>
 
 					<h2>Optional related objects</h3>
 					<? DisplayFormExperiments($experimentids, false); ?>

diff --git a/src/web/search.php b/src/web/search.php
@@ -1748,6 +1748,7 @@ function DisplaySearchResultsDefault(&$result, $s, $colors, $colors2) {
 		<form name="subjectlist" method="post" action="search.php" class="ui form">
 		<input type="hidden" name="modality" value="<?=$s_studymodality?>">
 		<input type="hidden" name="action" value="submit">
+		<input type="hidden" name="objecttype" value="series">
 		<?
 
 		/* if its MRI, get the basic QC data */
@@ -4669,7 +4670,10 @@ function CheckDestination() {
 						<div class="ui primary button" onclick="document.subjectlist.action='studies.php';document.subjectlist.action.value='submitminipipelines';document.subjectlist.submit();">Run</div>
 					</div>
 					<div class="ui horizontal left aligned divider">Batch Upload Data</div>
-					<div class="ui primary button" onclick="document.subjectlist.action='batchupload.php';document.subjectlist.action.value='displaystudylist';document.subjectlist.submit();">Upload</div>
+						<div class="ui primary button" onclick="document.subjectlist.action='batchupload.php';document.subjectlist.action.value='displaystudylist';document.subjectlist.submit();">Upload</div>
+					<div class="ui horizontal left aligned divider">Add to Package</div>
+						<!--<div class="ui primary button" onclick="document.subjectlist.action='batchupload.php';document.subjectlist.action.value='displaystudylist';document.subjectlist.submit();">Upload</div>-->
+						<div class="ui primary basic brown button" onclick="document.subjectlist.action='packages.php';document.subjectlist.action.value='addobject';document.subjectlist.submit();"><em data-emoji=":chipmunk:"></em> Add to Package</div>
 				</div>
 
 				<br><br>

diff --git a/src/web/setup.php b/src/web/setup.php
@@ -332,7 +332,7 @@ function CopyToClipboard(id) {
 						<i class="large <?=$icon2?> icon"></i> <b>Backup your database</b>
 						<p style="color: black"> Upgrade cannot continue until the backup <code><?=$backupfile?></code> exists (yes, even during the initial install. This will make sure you are familiar with the database backup process). Use the following command to backup your database. Replace PASSWORD with the <tt>nidb</tt> account password. This will be <tt>password</tt> for the initial install.</p>
 						<div class="ui fluid action input">
-							<input type="text" value="mysqldump --single-transaction --compact -u<?=$GLOBALS['cfg']['mysqluser']?> -pPASSWORD <?=$GLOBALS['cfg']['mysqldatabase']?> &gt; <?=$backupfile?>" style="font-family: monospace" id="backuptxt">
+							<input type="text" value="mysqldump --max_allowed_packet=1G --single-transaction --compact -u<?=$GLOBALS['cfg']['mysqluser']?> -pPASSWORD <?=$GLOBALS['cfg']['mysqldatabase']?> &gt; <?=$backupfile?>" style="font-family: monospace" id="backuptxt">
 							<button class="ui button" onClick="CopyToClipboard('backuptxt')" title="Copy only works when HTTPS is enabled :("><i class="copy icon"></i> Copy</button>
 						</div>
 						<p style="color: black">Run the above command, then come back to this page and refresh.</p>