From 180bb5e6ce117d966e586afd74283c90412a7a34 Mon Sep 17 00:00:00 2001 From: elgekko Date: Fri, 24 Mar 2023 15:09:02 +0100 Subject: [PATCH] HTV elesites utani verzio: 2.9.1 --- .../LOCAL/settings/application.yaml | 6 ++-- .../production/LOCAL/settings/mediacube.yaml | 4 +-- .../build-db-module.launch | 32 ++++++++++-------- .../build-remote-sqlj.bat | 12 ++++++- .../user/jobengine/db/BreakDAO_SJProfile0.ser | Bin 3253 -> 3253 bytes .../db/DomainCategoryDAO_SJProfile0.ser | Bin 2552 -> 2552 bytes .../jobengine/db/DomainDAO_SJProfile0.ser | Bin 4043 -> 4043 bytes .../db/DomainIndexDAO_SJProfile0.ser | Bin 3143 -> 3143 bytes .../jobengine/db/EntityBaseDAO_SJProfile0.ser | Bin 2286 -> 2286 bytes .../jobengine/db/FileTypeDAO_SJProfile0.ser | Bin 3872 -> 3872 bytes .../jobengine/db/FolderDAO_SJProfile0.ser | Bin 2479 -> 2479 bytes .../jobengine/db/HelperDAO_SJProfile0.ser | Bin 1674 -> 1674 bytes .../user/jobengine/db/ItemDAO_SJProfile0.ser | Bin 4337 -> 4337 bytes .../jobengine/db/ItemTypeDAO_SJProfile0.ser | Bin 2933 -> 2933 bytes .../user/jobengine/db/JobDAO_SJProfile0.ser | Bin 5414 -> 5414 bytes .../db/JobParametersDAO_SJProfile0.ser | Bin 2355 -> 2355 bytes .../jobengine/db/MasterIdDAO_SJProfile0.ser | Bin 1655 -> 1655 bytes .../generated/user/jobengine/db/MediaDAO.java | 18 ++++------ .../user/jobengine/db/MediaDAO_SJProfile0.ser | Bin 5358 -> 5262 bytes .../jobengine/db/MediaFileDAO_SJProfile0.ser | Bin 5008 -> 5008 bytes .../jobengine/db/MetadataDAO_SJProfile0.ser | Bin 6747 -> 6747 bytes .../db/MetadataElementDAO_SJProfile0.ser | Bin 2990 -> 2990 bytes .../db/MetadataTypeDAO_SJProfile0.ser | Bin 3013 -> 3013 bytes .../db/RemoteStoreDAO_SJProfile0.ser | Bin 3178 -> 3178 bytes .../db/SceneContentDAO_SJProfile0.ser | Bin 3376 -> 3376 bytes .../user/jobengine/db/SceneDAO_SJProfile0.ser | Bin 2973 -> 2973 bytes .../db/SearchDefinitionDAO_SJProfile0.ser | Bin 3528 -> 3528 bytes .../user/jobengine/db/ShotDAO_SJProfile0.ser | Bin 3487 -> 3487 bytes .../user/jobengine/db/StoreDAO_SJProfile0.ser | Bin 3164 -> 3164 bytes .../jobengine/db/StoreUriDAO_SJProfile0.ser | Bin 4756 -> 4756 bytes .../jobengine/db/UserInfoDAO_SJProfile0.ser | Bin 3637 -> 3637 bytes .../db/WorkflowActionDAO_SJProfile0.ser | Bin 4737 -> 4737 bytes .../scripts/043_add_filecount_to_media.sql | 2 +- .../src/user/jobengine/db/MediaDAO.sqlj | 6 ++-- server/user.mediacube.gui/pages/login.zul | 3 +- 35 files changed, 44 insertions(+), 39 deletions(-) diff --git a/server/-product/production/LOCAL/settings/application.yaml b/server/-product/production/LOCAL/settings/application.yaml index 42a5e798..ec8f844e 100644 --- a/server/-product/production/LOCAL/settings/application.yaml +++ b/server/-product/production/LOCAL/settings/application.yaml @@ -27,9 +27,9 @@ services: mediacube: proxy-root: /data/mediacube nexio: -# host: 10.10.1.55 -# collection-name: nexioclips -# use-mos-gateway: true + host: 10.10.1.55 + collection-name: nexioclips + use-mos-gateway: true disabled: true jobs: validate-transfers: false diff --git a/server/-product/production/LOCAL/settings/mediacube.yaml b/server/-product/production/LOCAL/settings/mediacube.yaml index 58e1653d..05ac5999 100644 --- a/server/-product/production/LOCAL/settings/mediacube.yaml +++ b/server/-product/production/LOCAL/settings/mediacube.yaml @@ -25,8 +25,8 @@ bottomTypeFilters: - name: Reklám nyers authentication: authEnabled: true - defaultUser: root - defaultPassword: password +# defaultUser: root +# defaultPassword: password adHost: localhost adNonSecurePort: 3268 adBaseDn: DC=intra,DC=mediavivantis,DC=hu diff --git a/server/user.jobengine.osgi.db/build-db-module.launch b/server/user.jobengine.osgi.db/build-db-module.launch index 4e36ed05..42ea8773 100644 --- a/server/user.jobengine.osgi.db/build-db-module.launch +++ b/server/user.jobengine.osgi.db/build-db-module.launch @@ -1,17 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/server/user.jobengine.osgi.db/build-remote-sqlj.bat b/server/user.jobengine.osgi.db/build-remote-sqlj.bat index 2c0c5492..6aa07fb8 100644 --- a/server/user.jobengine.osgi.db/build-remote-sqlj.bat +++ b/server/user.jobengine.osgi.db/build-remote-sqlj.bat @@ -6,10 +6,20 @@ ::Remote:: SET REMOTE_LOCATION=/tmp/mediaarch +:: USER +:: SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 86:5b:9b:bc:df:7b:df:90:c6:bf:60:69:d2:c9:61:62 +:: SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.228.198.1 + +:: MV +:: SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 01:03:8c:04:b0:a2:7d:a4:90:c8:01:c8:d8:4e:44:0d +:: SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.11.1.90 + ::LOCALVM HTV SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:58:1c:d3:b8:d5:7a:92:4c:a3:a5:8d:e2:7b:07:fd SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@localvm - + + + CALL :deploy_source if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL% diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser index d21fb888ec40398e7758da458fa7bcf30078ddf9..cbacf0058b33d022b520ecd7bcefc86c57c7603c 100644 GIT binary patch delta 18 acmdlgxm9ul4a%7ZWGZWd%*!VLgM76(ZH diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser index cca40b999d6a9d0cf6dea0b07546291cde53c891..31f62924e16e3c5e2247d2c2ae6a21f0b08f1f8b 100644 GIT binary patch delta 18 acmew%{6lyH4a%7ZUYY!+mE&H(^V!3Zt@ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser index 6e2b3cf64236ebf4158898d5af30e699c0762a48..fc46f0798b7191e089626c96c96f76887be4b52d 100644 GIT binary patch delta 18 acmX>te_DP64te_DP64a%7ZU&ZWd(R#RmXOSqIht diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser index 923cb88c6ba15c64a33a39cbf5b24ba9bc9a54f0..d594799c832ddc55f50799ef2bf69f10ed46595e 100644 GIT binary patch delta 18 ZcmX>uaa>{p4uaa>{p4a%7ZVTZ5CuS;|2gpGzUfi diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser index de2b0008d90a49bad0a05e67849517b0d9409b6b..66abbe4dbac2e21a881792fb98c42bf01df338cb 100644 GIT binary patch delta 18 acmaDS_)c&G4a%7ZW8ZWd&`%MJie_6RTl diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser index fa13d0812a71a85cb5f37e2760a19cf6a44b04be..7c1b21e1b1d10a7dfe33ad08eaa69e7fb2449d34 100644 GIT binary patch delta 18 ZcmZ1=w?J+K4a%7ZU|ZWd(Z=K}yl?FRDz diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser index 500e75281ea2bf3c95be2f83af6264da3a0eee55..d6a6b2029fbcfebbd6c8b2d1d4c67c822500f724 100644 GIT binary patch delta 18 ZcmZ24yk2+%4a%7d?%HVZP&;{X6a;0BHW diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser index ee0954fa2c9cb515172d6f84b938dbc4a8436fe4..8e47b15725857f773b4ab4f8e94321398be0f790 100644 GIT binary patch delta 18 ZcmeC;?c&|Q!^qms?fREzvmj$7D*!S^1rz`P delta 18 ZcmeC;?c&|Q!^qmU^583u&4P@TtN=R=1{MGS diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser index 6118bbd029ea39204f088dfeda2a57be8c514e31..10ffa1283d7f69c8710be15041fe018da32714b6 100644 GIT binary patch delta 18 ZcmeyU_)&2K4%_yI$#28#dy delta 18 acmeyU_)&2K4a%7d>YHVZO7;0FLqa|ew8 diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser index 846f31dc5dac8404f91a472833514a9f6aaa4d45..04d3f916ccd94c7dd8e5700ae01e282e2ef88a4e 100644 GIT binary patch delta 18 Zcmew=_El^H4a%7d>|Hw!YRZ~*{H><0?~ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser index 9f1469135219269398b97199e84882a06851ba68..92af79ff8f5e4f25996c2b03a448e77ca554d2d2 100644 GIT binary patch delta 18 ZcmZ3cwM=UR4a%7d>=HVZO}iU0sYv<6=Q diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser index 27214e3ee99095b9c574df5da0a976ab1089ee95..94656c69bb8a9e9333508771e8640159eb9156a7 100644 GIT binary patch delta 18 Zcmdliv{`5a4a%7d?LHw!Wa%7d>QHVZPQu>t@}kp~k1 diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java index 6ab99cc4..1bd55dd4 100644 --- a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java +++ b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java @@ -421,12 +421,11 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); - int fileCount = obj.getFileCount(); - /*@lineinfo:generated-code*//*@lineinfo:131^2*/ + /*@lineinfo:generated-code*//*@lineinfo:130^2*/ // ************************************************************ -// #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation, FILECOUNT = :fileCount WHERE ID = :id }; +// #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id }; // ************************************************************ { @@ -448,8 +447,7 @@ class MediaDAO extends EntityBaseDAO { __sJT_stmt.setTimestamp(8, archived); __sJT_stmt.setTimestamp(9, modified); __sJT_stmt.setTimestamp(10, creation); - __sJT_stmt.setInt(11, fileCount); - __sJT_stmt.setLong(12, id); + __sJT_stmt.setLong(11, id); __sJT_execCtx.executeUpdate(); } finally @@ -462,7 +460,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:131^284*/ +/*@lineinfo:user-code*//*@lineinfo:130^260*/ } @Override @@ -479,12 +477,11 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); - int fileCount = obj.getFileCount(); - /*@lineinfo:generated-code*//*@lineinfo:150^2*/ + /*@lineinfo:generated-code*//*@lineinfo:148^2*/ // ************************************************************ -// #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION, FILECOUNT) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation, :fileCount) }; +// #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation) }; // ************************************************************ { @@ -507,7 +504,6 @@ class MediaDAO extends EntityBaseDAO { __sJT_stmt.setTimestamp(9, archived); __sJT_stmt.setTimestamp(10, modified); __sJT_stmt.setTimestamp(11, creation); - __sJT_stmt.setInt(12, fileCount); __sJT_execCtx.executeUpdate(); } finally @@ -520,7 +516,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:150^278*/ +/*@lineinfo:user-code*//*@lineinfo:148^255*/ } /** diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser index f9a233381afbb470ee4d4adb2a193a7603844b47..0488636a034b4d6b6202d1e2e22569df815870eb 100644 GIT binary patch delta 279 zcmaE-*{8XIhmp0N+x2hgWQkgfcR2pDfES&$w&yEWuTiLxmI= zr+_5Yxr+-K>KLRL7#Qjq7#JA;|Ns9RBp?eSoBT#d+Hx|6 z>UOy586Y_Z1_mCGAu1rE6D~J*vV*WRoBpxOEiVJbhf9{X_jiCQA#cF-`-SrOpFa z+XXW2|NsBLL7HVjgdAM1e{zG6G~<-XbA+TVXJV*pg{zx~A=eI@#b(=tP3=9mhAYnrg(GQo~J~=^H+IA0yipg*l2cdG1KmqBVT2Kn2 fBp4VN7)lt9PM#xNf)W-2BKDIVL|7;Li`WAIi^XD2 diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser index 89a865010f7e9706e23a4d3f0988148592b28ba1..8dfc650845562191a3a0f2147dd2238aa3ec92c6 100644 GIT binary patch delta 18 ZcmbQBK0$p041-}3Q delta 18 acmbQBK0$p04a%7d?BHVZP=3jqK@Dh9m( diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser index f9359c445e93f002fa4eecb8fc525d3232a01878..a7e76fc3b8dd45785a2e3aaca2255d9dcf8cfecf 100644 GIT binary patch delta 18 Zcmca@a@%AB4+22%h4 delta 18 acmca@a@%AB4a%7d@+HVZO(Ndf>&$p=vY diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser index 8e1b38491f8b3fe6d4611650a9b519d86a8cbaad..e3e40946ea2e54f3934c254bea4fcac9d97d8b82 100644 GIT binary patch delta 18 ZcmZ1{zD|4t4a%7d>eHVZP&qepGw|4qepGw|4a%7d>OHw!Xu;Q|0hbO%`g diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser index 67f9262a4c885b91938a80991fb9b9c586398b2a..3235d0626366f61afa69380b0bec454966f2f872 100644 GIT binary patch delta 18 ZcmaDQ@k(L?4a%7d>uHw!XGasvQM`3F+~ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser index d83fe252d0949fee7fcac0a22a9ab0a137c02310..4cbd8c354f5483931ca53a70a86c2ca704f1b5c6 100644 GIT binary patch delta 18 ZcmdlWwLxkF4p_;1+)MF delta 18 acmdlWwLxkF4a%7d?_Y!+mc=K%mjR0g#G diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser index 66d96f471f1408041b24310f0a555775f0735f1b..c5fb24ce8e5e18cf11e9dddda258cf95e0601694 100644 GIT binary patch delta 18 ZcmbO$K39AL4a%7d@wZ5Cwg;Q|0cf(HHo diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser index 79020c66f1bf901979ff684519c433b8606f24f7..958625207bcdf291b95a760a755d780db80d8d1d 100644 GIT binary patch delta 18 acmX>heL{Kz4heL{Kz4a%7d@AY!+nP&I15Rln0*x diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser index 75db3eebf590dd0a85f1843a3aef5b82ca4b1f1e..20e7f5ddcad0033a07fbda0a79a07b6179b5fa34 100644 GIT binary patch delta 18 ZcmbO)JzshQ4n*|yBcmO*I1|k3e delta 18 acmbO)JzshQ4a%7d@=Z5Cwg;{gCf3a%7d>?Y!+nn<^}*udk1I$ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser index 89ce9145c525a60c054c9c0a5b32ca7e9167bce7..7898f8054940448ed1ab4316fcaa72a0111266c9 100644 GIT binary patch delta 18 ZcmbQDIz@E@4q delta 18 acmbQDIz@E@4a%7d>iZx&>176br9LkBwm diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser index c1113d8dc660f0b61b4779e5a49bebbf525a899b..4827ee769571747e1fa5cee2651351666ecb4da3 100644 GIT binary patch delta 18 ZcmdlgvsGpT4a%7d@&Y!+lx;ROIj`3DgI diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser index cbb4e30c34f55d4de49728ff32464d5304bff900..03fd8c29c59886b8951d5c44c8fc2b62fc714cb2 100644 GIT binary patch delta 18 ZcmZovZB*UB!^qms?fUorW#@b1_%HE delta 18 ZcmZovZB*UB!^qmU^5Cl%n*|vQ1OY-72NwVU diff --git a/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql b/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql index 4acd2fdc..3f2c100d 100644 --- a/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql +++ b/server/user.jobengine.osgi.db/migrations/scripts/043_add_filecount_to_media.sql @@ -2,7 +2,7 @@ DROP TRIGGER TRG_MEDIA_AFTER_UPDATE @ -ALTER TABLE MEDIA ADD COLUMN FILECOUNT INT +ALTER TABLE MEDIA ADD COLUMN FILECOUNT INT DEFAULT 0 @ CREATE TABLE FILECOUNTS AS diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj index 9e590b17..e2d7aa46 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj @@ -126,9 +126,8 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); - int fileCount = obj.getFileCount(); - #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation, FILECOUNT = :fileCount WHERE ID = :id }; + #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id }; } @Override @@ -145,9 +144,8 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); - int fileCount = obj.getFileCount(); - #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION, FILECOUNT) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation, :fileCount) }; + #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation) }; } /** diff --git a/server/user.mediacube.gui/pages/login.zul b/server/user.mediacube.gui/pages/login.zul index 9de0df77..05955a81 100644 --- a/server/user.mediacube.gui/pages/login.zul +++ b/server/user.mediacube.gui/pages/login.zul @@ -11,7 +11,6 @@