[PATCH 2 of 3] Use the sq relation artifact to load data from datacage

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1411658675 -7200
# Node ID 1e4e5ff44aa936183cbc07f509734d9f771fcfa9
# Parent  10917ec29625092b846a588901c708282c31d39e
Use the sq relation artifact to load data from datacage.

* Renamed the artifact in configs

diff -r 10917ec29625 -r 1e4e5ff44aa9 artifacts/doc/conf/conf.xml
--- a/artifacts/doc/conf/conf.xml	Thu Sep 25 17:23:12 2014 +0200
+++ b/artifacts/doc/conf/conf.xml	Thu Sep 25 17:24:35 2014 +0200
@@ -13,6 +13,7 @@
     <!ENTITY porosity-artifact  SYSTEM "artifacts/porosity.xml">
     <!ENTITY gaugedischargecurve-artifact  SYSTEM "artifacts/gaugedischargecurve.xml">
     <!ENTITY sqrelation-artifact SYSTEM "artifacts/sqrelation.xml">
+    <!ENTITY sqrelation-datacage-artifact SYSTEM "artifacts/sqrelation-datacage.xml">
     <!ENTITY sedimentload-artifact  SYSTEM "artifacts/sedimentload.xml">
     <!ENTITY sedimentload-ls-artifact  SYSTEM "artifacts/sedimentload-ls.xml">
 
@@ -142,6 +143,9 @@
             <artifact-factory name="staticsqrelation" description="Factory to create an artifact that generates sq relations from db."
                 ttl="3600000"
                 artifact="org.dive4elements.river.artifacts.D4EArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+            <artifact-factory name="sqrelationdatacage" description="Factory to create an artifact that generates sq relations from db."
+                ttl="3600000"
+                artifact="org.dive4elements.river.artifacts.SQRelationArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="morph-width" description="Factory to create an artifact used in minfo datacage."
                 ttl="3600000"
                 artifact="org.dive4elements.river.artifacts.StaticMorphWidthArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
@@ -293,6 +297,7 @@
         <artifact name="gaugedischarge" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/gaugedischarge.xml" />
         <artifact name="qsector" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/qsector.xml" />
         &sqrelation-artifact;
+        &sqrelation-datacage-artifact;
         &porosity-artifact;
         &gaugedischargecurve-artifact;
         &sedimentload-artifact;
diff -r 10917ec29625 -r 1e4e5ff44aa9 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Sep 25 17:23:12 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Sep 25 17:24:35 2014 +0200
@@ -2157,7 +2157,7 @@
                                            $start_time), ' bis ',
                                            dc:date-format('yyyy',
                                            $stop_time))"/>
-                        <sqvalue factory="staticsqrelation"
+                        <sqvalue factory="sqrelationdatacage"
                                  target_out="{$out}"
                                  ids="{$sqvid};{dc:uppercase($parameter)} - {$station_name}: {$combined_desc}"
                                  description="{$combined_desc}"/>
diff -r 10917ec29625 -r 1e4e5ff44aa9 artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java	Thu Sep 25 17:23:12 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java	Thu Sep 25 17:24:35 2014 +0200
@@ -37,7 +37,7 @@
     public static final String XPATH_RIVER = "/art:action/art:river/@art:name";
     public static final String XPATH_STATION =
         "/art:action/art:measurement_station/@art:number";
-    public static final String NAME = "staticsqrelation";
+    public static final String NAME = "sqrelationdatacage";
     public static final String STATIC_STATE_NAME = "state.sqrelation.static";
     public static final String UIPROVIDER = "static_sqrelation";
     public static final String SQ_RELATION_OUT_A = "sq_relation_a";