--- a/doc/ChangeLog	Fri May 07 06:52:27 2010 +0000
+++ b/doc/ChangeLog	Fri May 07 08:23:18 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-07  Tim Englich  <tim@intevation.de>
+
+	* model_of_transitions.tex:
+	Answerd Questions and increase some Sections of the Documentation.
+
 2010-05-07  Hans Plum <hans@intevation.de>
 
 	* config-manual/config-manual.txt: Added some more FIXMEs for internal

--- a/doc/config-manual/model_of_transitions.tex	Fri May 07 06:52:27 2010 +0000
+++ b/doc/config-manual/model_of_transitions.tex	Fri May 07 08:23:18 2010 +0000
@@ -248,7 +248,8 @@
                    conf/queries.properties
     \item dataname: The ID of the Data which will be displayed in this State.
                     The ID will be use to localize the description of the Data.
-                    %% FIXME HP: Where are this localization files; a hint is enough
+                    The Localization is located in Module gnv-artifacts in Folder
+                    src/main/resources.
     \item data-multiselect: true it is possible to select 1 or more Items.
                             false it is possible to select only one Item.
     \item inputvalues: The Values which can be "feed" to this State and which 
@@ -288,7 +289,12 @@
                 of the Value.
                 This might be String, Integer, Double, Date, Point, LineString, 
                 Polygon, Coordinate, Geometry and AttributeName.
-                %% FIXME HP: Explain Coordinate, AttributeName
+                Coordinate is a Format which accepts Geographical Coodinates in 
+                the following Syntax: 56n30 6e20
+                AttributeName marks a StringValue which will be used in 
+                SQL-Statement without surrounding with "'" in the Statement.
+                Usage is e.g. for determining the Axis (i or j) in the Workflow
+                of HorizontalProfiles.
     \item multiselect: true if more than on Value can be feed or put into the SQL-statement.
                        false if one on Value will be accepted.
     \item usedinquery: Number how often the value should be put into the SQL-Statement:
@@ -301,9 +307,11 @@
 
 The next part will explain the usage of inputvalues.
 
-This SQL-statement is configured to use in the State above.
+This SQL-statement is configured to use in the State above, which will fetch
+all ParameterIDs with the according german name which are reffered to the given
+TimeSeriesPoint (e.g.Arkona Basin Buoy FeatureID = 100011 )
 
-%% FIXME HP: What do we expect with this statement? Whats the result?
+ 
 \begin{lstlisting}
 SELECT DISTINCT 
        p.PARAMETERID KEY, 
@@ -323,11 +331,12 @@
 \end{lstlisting}
 
 If there are put the Inputvalues in it it will look like this
-if we assume that the inputvalues has got the following values:
+if we assume that the inputvalues has got the following values
+which where feed by choosing this FIS (fisname) and the Station
+(featureid: Arkona Basin Buoy ):
 \begin{itemize}
-    \item featureid: 4 (Marnet)
+    \item featureid: 100011 (Marnet ==> Arkona Basin Buoy)
     \item fisname: fis\_marnet
-    %% FIXME HP: Where does these values come from? Do not get the context, sense here.
     \item parameterid: not set because it's the value that should be 
                        chosen in this state. 
 \end{itemize}
@@ -346,7 +355,7 @@
       M.MEASUREMENTID = TSV.MEASUREMENTID AND 
       TS.TIMESERIESID = TSV.TIMESERIESID AND 
       P.PARAMETERID = TS.PARAMETERID AND 
-      TSP.FEATUREID = 4 
+      TSP.FEATUREID = 100011
 ORDER BY P.GERMANNAME
 \end{lstlisting}
 
@@ -381,43 +390,69 @@
 \begin{lstlisting}
 SELECT DISTINCT 
     ...
-    TSP.FEATUREID = 4 AND
-    TSP.FEATUREID = 4 
+    TSP.FEATUREID = 100011 AND
+    TSP.FEATUREID = 100011 
 ORDER BY P.GERMANNAME
 \end{lstlisting}
 
 
-If the Attribute usedinquery of the inputvalue fisname additionally is set to "1"
-this might happen.
+At the next Step of the Workflow it is nessesary to determine all depths where
+the choosen parameters are meaured.
+To do this we might have the following InputValues:
 
 \begin{lstlisting}
 <inputvalues>
     <inputvalue name="featureid" type="Integer" multiselect="false" usedinquery="2"/>
-    <inputvalue name="fisname" type="String" multiselect="false" usedinquery="1"/>
-    <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="0"/>
+    <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+    <inputvalue name="parameterid" type="Integer" multiselect="true" usedinquery="1"/>
+    <inputvalue name="measurementid" type="Integer" multiselect="true" usedinquery="0"/>
 </inputvalues>
 \end{lstlisting}
 
+\begin{itemize}
+   \item featureid: 100011 (Marnet ==> Arkona Basin Buoy)
+   \item fisname: fis\_marnet
+   \item parameterid: 2 (Salzgehalt [pSal])
+   \item measurementid: not set because it's the value that should be
+                        chosen in this state.
+\end{itemize}
 
-%% FIXME HP: For the fisname, we get NOCOLUMNINDB? Why? Better to take an existing/real example ...
 \begin{lstlisting}
- SELECT DISTINCT 
-    ...
-    TSP.FEATUREID = ? AND
-    TSP.FEATUREID = ? AND
-    NOCOLUMNINDB  = ?
-ORDER BY P.GERMANNAME
+SELECT DISTINCT 
+       M.MEASUREMENTID KEY, 
+       M.ZLOCATION VALUE, 
+       P.PARAMETERID PARAMETERID 
+FROM MEDIAN.MEASUREMENT M, 
+     MEDIAN.TIMESERIESVALUE TSV, 
+     MEDIAN.TIMESERIES T, 
+     MEDIAN.PARAMETER P 
+WHERE M.MEASUREMENTID = TSV.MEASUREMENTID AND 
+      TSV.TIMESERIESID = T.TIMESERIESID AND 
+      T.PARAMETERID = P.PARAMETERID AND 
+      M.FEATUREID = ? AND 
+      M.FEATUREID = ? AND 
+      P.PARAMETERID IN (?)
+ORDER BY m.ZLOCATION DESC
 \end{lstlisting}
 
 This SQL-statement will be modified to
 
 \begin{lstlisting}
 SELECT DISTINCT 
-    ...
-    TSP.FEATUREID = 4 AND
-    TSP.FEATUREID = 4 AND
-    NOCOLUMNINDB  = 'fis\_marnet' 
-ORDER BY P.GERMANNAME
+       M.MEASUREMENTID KEY, 
+       M.ZLOCATION VALUE, 
+       P.PARAMETERID PARAMETERID 
+FROM MEDIAN.MEASUREMENT M, 
+     MEDIAN.TIMESERIESVALUE TSV, 
+     MEDIAN.TIMESERIES T, 
+     MEDIAN.PARAMETER P 
+WHERE M.MEASUREMENTID = TSV.MEASUREMENTID AND 
+      TSV.TIMESERIESID = T.TIMESERIESID AND 
+      T.PARAMETERID = P.PARAMETERID AND 
+      M.FEATUREID = 100011 AND 
+      M.FEATUREID = 100011 AND 
+      P.PARAMETERID IN (2)
+ORDER BY m.ZLOCATION DESC
 \end{lstlisting}
 
 
@@ -448,7 +483,9 @@
   \item to:   The ID of the State which can be reached.
   \item condition: The Condition which have to be fulfilled.
 \end{itemize}
-%% FIXME: What type of conditions do exist?
+
+At this Moment only EQUAL and NOTEQUAL are supported as condition for an
+ValueCompareTransition.
 
 \paragraph{Outputstate}
 
@@ -465,7 +502,6 @@
   \item TimeSeries: TimeSeriesOutputState
   \item Horizontalprofile: HorizontalProfileOutputState
   \item Horizontalprofile on Meshes: HorizontalProfileMeshOutputState
-  %% FIXME HP: Whats the reason for this split up? Horizontale Schnittprofile? Explain orally.
   \item Verticalcrosssection:VerticalCrossSectionOutputState
   \item Verticalprofiles: VerticalProfileOutputState
   \item Horizontalcrosssections: HorizontalCrossSectionMeshOutputState