r46738 - mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams

[andre]

Author: andre
Date: 2016-09-18 13:33:37 +0200 (Sun, 18 Sep 2016)
New Revision: 46738

Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java
Log:
find label in jdlist if not yet in node

Modified: mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java
===================================================================
--- mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java 2016-09-17 20:52:50 UTC (rev 46737)
+++ mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java 2016-09-18 11:33:37 UTC (rev 46738)
@@ -21,34 +21,29 @@

package org.mmbase.streams;

-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
+import org.mmbase.applications.media.State;
import org.mmbase.bridge.Field;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.datatypes.processors.ChainedCommitProcessor;
import org.mmbase.datatypes.processors.CommitProcessor;
+import org.mmbase.security.ActionRepository;
+import org.mmbase.streams.createcaches.JobDefinition;
+import org.mmbase.streams.createcaches.Processor;
import org.mmbase.streams.createcaches.Stage;
-import org.mmbase.streams.createcaches.Processor;
-import org.mmbase.streams.createcaches.JobDefinition;
-import org.mmbase.applications.media.State;
-
import org.mmbase.streams.transcoders.AbstractTranscoder;
import org.mmbase.streams.transcoders.Analyzer;
import org.mmbase.streams.transcoders.Transcoder;
import org.mmbase.util.MimeType;
-import org.mmbase.security.ActionRepository;
import org.mmbase.util.functions.NodeFunction;
import org.mmbase.util.functions.Parameter;
import org.mmbase.util.functions.Parameters;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;

+import java.util.*;
+
/**
* Triggers (re)creation of caches (streamsourcescaches) of a source node
* (streamsources). The parameter 'all' determines whether to recreate all caches
@@ -241,6 +236,19 @@
String label = "";
if (cache.getNodeManager().hasField("label")) {
label = cache.getStringValue("label");
+
+ // iterate config keys in caches and find label if not yet there
+ Iterator<Map.Entry<String,String>> it = configKeys.entrySet().iterator();
+ while (label.equals("") && it.hasNext()) {
+ Map.Entry<String, String> e = it.next();
+ String config_id = e.getKey();
+ String config_key = e.getValue();
+ if (config_key.equals(key)) {
+ label = jdlist.get(config_id).getLabel();
+ }
+ }
+
+
}
MimeType mt = new MimeType( cache.getStringValue("mimetype") );
Transcoder tr = null;