diff options
| author | Javier Sánchez Parra <jsanchez@soleta.eu> | 2020-09-10 10:17:43 +0200 |
|---|---|---|
| committer | OpenGnSys Support Team <soporte-og@soleta.eu> | 2020-09-10 14:52:01 +0200 |
| commit | ad61ab775d9cc36aac2694bc5e47017386f1e7db (patch) | |
| tree | a3416254eba318a8a7c8b5bdcee48b314a4f2575 | |
| parent | a3aa3e336bbe706c92195cb08bc34c4821798642 (diff) | |
#1004 Add new fields to imagenes table
Extend database to store new fields that contain information about "clonator",
"compressor", "filesystem" and "datasize".
This patch also creates a /tmp/image.info file that is consumed by ogClient.
| -rw-r--r-- | admin/Database/ogAdmBD-1.1.1c-1.2.0.sql | 9 | ||||
| -rw-r--r-- | admin/Database/ogAdmBD.sql | 4 | ||||
| -rwxr-xr-x | client/engine/Image.lib | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/admin/Database/ogAdmBD-1.1.1c-1.2.0.sql b/admin/Database/ogAdmBD-1.1.1c-1.2.0.sql index fb16fe46..f3aa2be9 100644 --- a/admin/Database/ogAdmBD-1.1.1c-1.2.0.sql +++ b/admin/Database/ogAdmBD-1.1.1c-1.2.0.sql @@ -29,6 +29,15 @@ CREATE PROCEDURE altercols() BEGIN ALTER TABLE remotepc ADD urlrelease VARCHAR(100) DEFAULT NULL; END IF; + IF NOT EXISTS (SELECT * FROM information_schema.COLUMNS + WHERE COLUMN_NAME='clonator' AND TABLE_NAME='imagenes' AND TABLE_SCHEMA=DATABASE()) + THEN + ALTER TABLE imagenes + ADD clonator varchar(100) NOT NULL DEFAULT '', + ADD compressor varchar(100) NOT NULL DEFAULT '', + ADD filesystem varchar(100) NOT NULL DEFAULT '', + ADD datasize bigint NOT NULL DEFAULT 0; + END IF; END// # Ejecutar actualización condicional. DELIMITER ';' diff --git a/admin/Database/ogAdmBD.sql b/admin/Database/ogAdmBD.sql index cc5d001b..8264a696 100644 --- a/admin/Database/ogAdmBD.sql +++ b/admin/Database/ogAdmBD.sql @@ -447,6 +447,10 @@ CREATE TABLE `imagenes` ( `ruta` varchar(250) NULL, `fechacreacion` datetime DEFAULT NULL, `inremotepc` tinyint NOT NULL DEFAULT 0, + `clonator` varchar(100) NOT NULL DEFAULT '', + `compressor` varchar(100) NOT NULL DEFAULT '', + `filesystem` varchar(100) NOT NULL DEFAULT '', + `datasize` bigint NOT NULL DEFAULT 0, PRIMARY KEY (`idimagen`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/client/engine/Image.lib b/client/engine/Image.lib index 20e7f7df..3b5fdbc8 100755 --- a/client/engine/Image.lib +++ b/client/engine/Image.lib @@ -362,6 +362,7 @@ eval $PROGRAM ERRCODE=$? if [ $ERRCODE == 0 ]; then echo "$(ogGetImageInfo $IMGFILE):$(ogGetHostname)" > $IMGFILE.info + cp -f $IMGFILE.info /tmp/image.info else ogRaiseError $OG_ERR_IMAGE "$1 $2 $IMGFILE" rm -f "$IMGFILE" |