# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1314187964 0
# Node ID 107d44b3455d57cec54406c9e8522b66ce174dfb
# Parent  80aecb01d79a550ed822ac63782991694be55672
Added conf for factory and rule for MainValueArtifacts, missing ChangeLog entry.


flys-artifacts/trunk@2557 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 80aecb01d79a -r 107d44b3455d flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Aug 24 12:07:33 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Aug 24 12:12:44 2011 +0000
@@ -1,3 +1,24 @@
+2011-08-24  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Added factory and rule for MainValueArtifacts.
+
+	* doc/conf.xml:
+	  Add a mainvalue factory to serve MainValueArtifacts.
+
+	* doc/conf/meta-data.xml:
+	  Recomment mainvalue artifact when computed_discharge_curve can be put out.
+
+2011-08-24  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Let MainValuesArtifact have a state, outputmode and facet.
+
+	* src/main/java/de/intevation/flys/artifacts/states/StaticState.java:
+	  New, a non-abstract DefaultState.
+
+	* src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java:
+	  Progressed with implementation, use StaticState to hook output modes and
+	  facet in; use (Static)FLYSArtifact implementation.
+
 2011-08-24  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	Smaller cosmetics.
diff -r 80aecb01d79a -r 107d44b3455d flys-artifacts/doc/conf/cache.xml
--- a/flys-artifacts/doc/conf/cache.xml	Wed Aug 24 12:07:33 2011 +0000
+++ b/flys-artifacts/doc/conf/cache.xml	Wed Aug 24 12:12:44 2011 +0000
@@ -28,7 +28,7 @@
            memoryStoreEvictionPolicy="LRU"
            />
 
-    <!-- This one is used to cache the distance infos per river -->
+    <!-- This one is used to cache the distance infos per river as Documents -->
     <cache name="service-distanceinfo"
            maxElementsInMemory="20"
            eternal="false"
@@ -37,6 +37,15 @@
            memoryStoreEvictionPolicy="LFU"
            />
 
+    <!-- This one is used to cache the distance infos per river as Lists -->
+    <cache name="annotations"
+           maxElementsInMemory="200"
+           eternal="false"
+           timeToIdleSeconds="360"
+           timeToLiveSeconds="86400"
+           memoryStoreEvictionPolicy="LFU"
+           />
+
     <!-- This one is used to cache the computed values.-->
     <cache name="computed.values"
            maxElementsInMemory="200"
diff -r 80aecb01d79a -r 107d44b3455d flys-artifacts/doc/conf/conf.xml
--- a/flys-artifacts/doc/conf/conf.xml	Wed Aug 24 12:07:33 2011 +0000
+++ b/flys-artifacts/doc/conf/conf.xml	Wed Aug 24 12:12:44 2011 +0000
@@ -23,6 +23,9 @@
             <artifact-factory name="annotations" description="Factory to create an artifact to access Annotations for Points at rivers"
                 ttl="3600000"
                 artifact="de.intevation.flys.artifacts.AnnotationArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+            <artifact-factory name="mainvalue" description="Factory to create an artifact to access Main Values for discharge curve diagrams"
+                ttl="3600000"
+                artifact="de.intevation.flys.artifacts.MainValuesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
         </artifact-factories>
 
         <user-factory name="default" description="Factory to create new users">de.intevation.artifactdatabase.DefaultUserFactory</user-factory>
diff -r 80aecb01d79a -r 107d44b3455d flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed Aug 24 12:07:33 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Wed Aug 24 12:12:44 2011 +0000
@@ -262,6 +262,14 @@
                   </extra-longitudinal-sections>
                 </discharge-table-nn>
             </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
+                <discharge-curve>
+                  <mainvalue>
+                    <dc:attribute name="factory" value="mainvalue"/>
+                    <dc:attribute name="db-ids" value="${river_id}"/>
+                  </mainvalue>
+                </discharge-curve>
+            </dc:if>
             <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
                 <longitudinal-section>
                   <dc:call-macro name="longitudinal_section-recommended"/>