packages UI

gbook · Jan 19, 2024 · 984a32f · 984a32f
1 parent ed2faed
commit 984a32f
Show file tree

Hide file tree

Showing 6 changed files with 273 additions and 66 deletions.
diff --git a/src/squirrel/squirrel.cpp b/src/squirrel/squirrel.cpp
@@ -65,6 +65,23 @@ squirrel::~squirrel()
 }
 
 
+/* ---------------------------------------------------------- */
+/* --------- DatabaseConnect -------------------------------- */
+/* ---------------------------------------------------------- */
+bool squirrel::DatabaseConnect() {
+
+    db = QSqlDatabase::addDatabase("QSQLITE");
+    db.setDatabaseName(QString(workingDir + "/squirrel.db"));
+
+    if (db.open()) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+
+
 /* ------------------------------------------------------------ */
 /* ----- read ------------------------------------------------- */
 /* ------------------------------------------------------------ */

diff --git a/src/squirrel/squirrel.h b/src/squirrel/squirrel.h
@@ -27,6 +27,7 @@
 #include <QDate>
 #include <QDateTime>
 #include <QDebug>
+#include <QtSql>
 #include "squirrelSubject.h"
 #include "squirrelExperiment.h"
 #include "squirrelPipeline.h"
@@ -124,13 +125,17 @@ class squirrel
     QString GetLog() { return log; }
 
 private:
+    bool DatabaseConnect();
+
     void PrintPackage();
     bool MakeTempDir(QString &dir);
     QString workingDir;
     QString logfile;
     QStringList msgs; /* squirrel messages, to be passed back upon writing (or reading) through the squirrel library */
     QString log;
 
+    QSqlDatabase db;
+
 	bool isValid;
 	bool isOkToDelete;
 };

diff --git a/src/squirrel/squirrellib.pro b/src/squirrel/squirrellib.pro
@@ -1,6 +1,7 @@
 # Use this file to build libsquirrel
 
 QT -= gui
+QT += sql
 
 CONFIG += c++17 console
 CONFIG -= app_bundle

diff --git a/src/web/functions.php b/src/web/functions.php
@@ -686,6 +686,8 @@ function GetSeriesInfo($id, $modality) {
 		$row = mysqli_fetch_array($result, MYSQLI_ASSOC);
 		$uid = $row['uid'];
 		$seriesnum = $row['series_num'];
+		$seriessize = $row['series_size'];
+		$numfiles = $row['numfiles'];
 		$studynum = $row['study_num'];
 		$subjectid = $row['subject_id'];
 		$studyid = $row['study_id'];
@@ -697,7 +699,7 @@ function GetSeriesInfo($id, $modality) {
 		$projectid = $row['project_id'];
 
 		$path = $GLOBALS['cfg']['archivedir'] . "/$uid/$studynum";
-		return array($path, $uid, $studynum, $seriesnum, $studyid, $subjectid, $modality, $type, $studydatetime, $enrollmentid, $projectname, $projectid);
+		return array($path, $uid, $studynum, $seriesnum, $seriessize, $numfiles, $studyid, $subjectid, $modality, $type, $studydatetime, $enrollmentid, $projectname, $projectid);
 	}
 
 

diff --git a/src/web/menu.php b/src/web/menu.php
@@ -128,7 +128,7 @@
 				$studyid = GetVariable("studyid");
 			}
 			if (($seriesid != "") && ($modality != "")) {
-				list($path1, $uid, $studynum, $seriesnum, $studyid, $subjectid, $modality1, $studytype1, $studydatetime1, $enrollmentid1, $projectname, $projectid) = GetSeriesInfo($seriesid, $modality);
+				list($path1, $uid, $studynum, $seriesnum, $seriessize, $numfiles, $studyid, $subjectid, $modality1, $studytype1, $studydatetime1, $enrollmentid1, $projectname, $projectid) = GetSeriesInfo($seriesid, $modality);
 				?>
 				<a href="projects.php?action=displayprojectinfo&id=<?=$projectid?>" class="item"><?=$projectname?></a>
 				<a href="subjects.php?id=<?=$subjectid?>" class="item"><?=$uid?></a>