From: elgekko Date: Tue, 17 May 2022 08:00:53 +0000 (+0200) Subject: salata X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=2ff00912ebe5d3cb2cc146f92c92c678276d36ca;p=mediacube.git salata --- diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java index 2af80fe1..31f89526 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java @@ -41,8 +41,7 @@ public class OctopusAPI implements IOctopusAPI { } } - private List getReferencedObjects(List stories, String referenceCollectionName, - String referenceField) { + private List getReferencedObjects(List stories, String referenceCollectionName, String referenceField) { List ids = null; for (DBObject story : stories) { if (story == null) @@ -129,8 +128,8 @@ public class OctopusAPI implements IOctopusAPI { @Override public String getRundownContent(long id) { - BasicDBObject fields = new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1) - .append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1).append(SCRIPT_CONTENT, 1); + BasicDBObject fields = new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1).append(REF_RUNDOWN, 1).append(FORMAT, 1) + .append(MOS_OBJECTS, 1).append(SCRIPT_CONTENT, 1); List stories = getRundownStories(id, fields); return getRundownContent(stories); } @@ -140,8 +139,7 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection - .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) + DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) .sort(new BasicDBObject("name", 1)); if (find.hasNext()) { result = find.toArray(); @@ -206,8 +204,7 @@ public class OctopusAPI implements IOctopusAPI { // "OCTOPUS-ECHOTV-2429902"}}}) DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, - new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); + BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_RUNDOWN, 1)); // List rundowns = NoSQLUtils.asList(find); if (!find.hasNext()) { @@ -227,9 +224,8 @@ public class OctopusAPI implements IOctopusAPI { DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); DBCursor find = collection - .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))), - new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1) - .append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1)) + .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))), new BasicDBObject(ID, 1) + .append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1).append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1)) .sort(new BasicDBObject("name", 1)); if (find.hasNext()) result = find.toArray(); @@ -242,8 +238,7 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection - .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) + DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) .sort(new BasicDBObject("name", 1)); if (find.hasNext()) result = find.toArray(); @@ -262,13 +257,14 @@ public class OctopusAPI implements IOctopusAPI { } } }); + + Collections.sort(result, (o1, o2) -> { + long pos1 = NoSQLUtils.asLong((BasicDBObject) o1, POSITION); + long pos2 = NoSQLUtils.asLong((BasicDBObject) o2, POSITION); + return (pos1 < pos2 ? -1 : (pos1 == pos2 ? 0 : 1)); + }); } - Collections.sort(result, (o1, o2) -> { - long pos1 = NoSQLUtils.asLong((BasicDBObject) o1, POSITION); - long pos2 = NoSQLUtils.asLong((BasicDBObject) o2, POSITION); - return (pos1 < pos2 ? -1 : (pos1 == pos2 ? 0 : 1)); - }); return result; } @@ -277,8 +273,7 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection.find(new BasicDBObject(), new BasicDBObject("mosObjects", 1).append("_id", 0)) - .limit(1000); + DBCursor find = collection.find(new BasicDBObject(), new BasicDBObject("mosObjects", 1).append("_id", 0)).limit(1000); if (find.hasNext()) result = find.toArray(); return result; @@ -317,8 +312,7 @@ public class OctopusAPI implements IOctopusAPI { List result = new ArrayList<>(); DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, - new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); + BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); DBCursor find = storyCollection.find(criteria); if (find.hasNext()) { result = find.toArray(); @@ -342,8 +336,7 @@ public class OctopusAPI implements IOctopusAPI { public List getStoryFoldersByParentStoryID(String id) { DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id), - new BasicDBObject(REF_STORYFOLDER, 1)); + DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id), new BasicDBObject(REF_STORYFOLDER, 1)); if (!find.hasNext()) return null; return getReferencedObjects(find.toArray(), FOLDER_COLLECTION, REF_STORYFOLDER); @@ -353,8 +346,7 @@ public class OctopusAPI implements IOctopusAPI { public List getStoryFoldersByPlaceHolderID(String id) { DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, - new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); + BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_STORYFOLDER, 1)); if (!find.hasNext()) return null; @@ -366,10 +358,9 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection.find( - new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), - new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1) - .append(REF_STORYFOLDER, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1)) + DBCursor find = collection + .find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), new BasicDBObject(ID, 1) + .append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1).append(REF_STORYFOLDER, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1)) .sort(new BasicDBObject(NAME, 1)); if (find.hasNext()) result = find.toArray(); @@ -381,9 +372,7 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection - .find(new BasicDBObject(REF_STORYFOLDER, - new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), fields) + DBCursor find = collection.find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), fields) .sort(new BasicDBObject(NAME, 1)); if (find.hasNext()) result = find.toArray(); diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/CachedListModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/CachedListModel.class deleted file mode 100644 index ed734244..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/CachedListModel.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$1.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$1.class deleted file mode 100644 index 59045144..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$1.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$2.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$2.class deleted file mode 100644 index f29cca7e..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel$2.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel.class deleted file mode 100644 index fcb8ad30..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/GridSearchModel.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/IndexModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/IndexModel.class deleted file mode 100644 index c82e8137..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/IndexModel.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/MissingMaterialsModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/MissingMaterialsModel.class deleted file mode 100644 index 1e53170b..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/MissingMaterialsModel.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$1.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$1.class deleted file mode 100644 index fa540291..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$1.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$2.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$2.class deleted file mode 100644 index 29f36da9..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel$2.class and /dev/null differ diff --git a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel.class b/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel.class deleted file mode 100644 index 8abad00b..00000000 Binary files a/server/user.mediacube.gui/bin/user/jobengine/zk/model/TabulatorSearchModel.class and /dev/null differ