# HG changeset patch # User Christian Lins # Date 1352985655 -3600 # Node ID 5a2dba5be941dd755637dc056f65e7a7e7ade8ba # Parent 953480be5543b3ff0bd05bc5597895bfe5e558e0# Parent 4c2c1d4cf777080fa056030a1b996a0e82709605 Merged diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java Thu Nov 15 14:20:55 2012 +0100 @@ -72,7 +72,7 @@ return new String[0]; } - List outs = flys.getCurrentOutputs(context); + List outs = flys.getCurrentOutputs(context); int num = outs == null ? 0 : outs.size(); @@ -86,6 +86,9 @@ } + /** + * Creates Map from Strings "recommended" to "true". + */ protected Map getNoneUserSpecificParameters( FLYSArtifact flys, CallContext context) diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/Access.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/Access.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/Access.java Thu Nov 15 14:20:55 2012 +0100 @@ -37,6 +37,8 @@ this.artifact = artifact; } + + /** Get a data entry as string. */ protected String getString(String key) { StateData sd = artifact.getData(key); if (sd == null) { @@ -46,6 +48,7 @@ return (String)sd.getValue(); } + /** Get a data entry as double, returns null if string not double valueoffable. */ protected Double getDouble(String key) { StateData sd = artifact.getData(key); if (sd == null) { diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java Thu Nov 15 14:20:55 2012 +0100 @@ -50,3 +50,4 @@ return a.getInteger("height_id"); } } +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java Thu Nov 15 14:20:55 2012 +0100 @@ -135,6 +135,11 @@ } } + + /** + * Put Key/Values from \param src to \param dst, but uppercase + * both Keys and Values. + */ public static void convertKeysToUpperCase( Map src, Map dst @@ -147,6 +152,7 @@ /** * Append recommendations to \param result. + * @param extraParameters parameters (typicall example: 'recommended') */ public void recommend( FLYSArtifact artifact, diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java Thu Nov 15 14:20:55 2012 +0100 @@ -29,6 +29,7 @@ import org.apache.log4j.Logger; + public class Builder { private static Logger log = Logger.getLogger(Builder.class); @@ -53,6 +54,7 @@ protected Map compiledStatements; + /** Connection to either of the databases. */ public static class NamedConnection { protected String name; diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingResult.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingResult.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingResult.java Thu Nov 15 14:20:55 2012 +0100 @@ -7,6 +7,7 @@ import de.intevation.flys.utils.KMIndex; +/** Result of a FixRealizing Calculation. */ public class FixRealizingResult extends FixResult implements WQKmsResult diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java Thu Nov 15 14:20:55 2012 +0100 @@ -22,6 +22,19 @@ import de.intevation.flys.artifacts.FLYSArtifact; + +/** + * Following XPaths are evaluated on the incoming document. + * + * "/art:meta/art:artifact-id/@value" The UUID of the artifact. Optional. + * Used to fill the template enviroment. + * "/art:meta/art:user-id/@value" The UUID of the user. Optional. + * If given the user specific template is filled. + * "/art:meta/art:outs/@value" The list of outs used to recommend for the + * various outputs. + * "/art:meta/art:parameters/@value" A list of key/value pairs to inject more + * filters to the templating. + */ public class MetaDataService extends FLYSService { diff -r 4c2c1d4cf777 -r 5a2dba5be941 flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Thu Nov 15 14:19:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CollectionHelper.java Thu Nov 15 14:20:55 2012 +0100 @@ -421,7 +421,7 @@ } if (ttlStr.length() == 0) { - logger.warn("Found an invalid Collectioni (zero length ttl)!"); + logger.warn("Found an invalid Collection (zero length ttl)!"); return null; }