From: Vásáry Dániel Date: Thu, 13 Sep 2018 09:26:38 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=cb06d411bfd57a0f4f3cce232cf362bf05771601;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31272 --- diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java index 55d64b9a..b69535f3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java @@ -192,16 +192,20 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { DBCollection clips = db.getCollection(NEXIOCLIPS); BasicDBObject clip = (BasicDBObject) clips.findOne(new BasicDBObject(LONGNAMEID, mosID)); if (clip == null) { - logger.debug("File NOT exists: {}", mosID); + logger.debug("File {} NOT exists", mosID); return null; //throw new Exception(String.format("File NOT exists %s", mosID)); } else { - logger.debug("File exists: {}", mosID); + logger.debug("File {} exists", mosID); } long duration = NoSQLUtils.asLong(clip, DURATION); if (duration == 0) { - logger.debug("File exists with 0 length: {}", mosID); + logger.debug("File {} exists with 0 frame length", mosID); + return null; + } + if (duration == 1) { + logger.debug("File {} exists with 1 frame length", mosID); return null; } return new FileArchive(mosID, duration); @@ -268,6 +272,8 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep { logger.info("Saving rundown {} {}", rundownID, rundownName); copy(rundownArchive); + logger.info(systemMarker, "A '{}' tükör {}db bejátszójának archiválása sikeres volt", rundownArchive.getItemTitle(), + rundownArchive.getStoryArchives().size()); db.getCollection(ARCHIVEDRUNDOWNS).save(currentRundownID); } catch (Exception e) { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java index 6aa8a384..dced4489 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java @@ -142,6 +142,7 @@ public class OctopusDataMiner { if (rundown == null || !rundown.containsKey(IOctopusAPI.ID)) continue; BasicDBObject rundownWithStoryids = queryRundown(rundown, FIELDS_RUNDOWN_STORYIDS); + //TODO ez neha null? long rundownId = rundownWithStoryids.getLong(IOctopusAPI.ID); List slugs = NoSQLUtils.asList(rundownWithStoryids, IOctopusAPI.SLUGS); if (slugs == null)