perfsonar development work

Author: psnc.pikusa
Date: 2011-10-05 14:39:44 +0100 (Wed, 05 Oct 2011)
New Revision: 5858

Modified:
   trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml
   trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml
Log:
small refactorization

Modified: trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml      2011-10-05 
13:39:02 UTC (rev 5857)
+++ trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml      2011-10-05 
13:39:44 UTC (rev 5858)
@@ -40,7 +40,7 @@
           parameterMap="select-parameters1" resultMap="select-results">
     <![CDATA[
         select receiveSynchronized, receiveTime, receiveTimeError, 
sendSynchronized, sendTime, sendTimeError, seqNum, timeType, timeValue, ttl 
-        from clmp_owamp 
+        from owamp 
         where metadataId = ?
                and ts >= ?
         and ts <= ?

Modified: trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml       
2011-10-05 13:39:02 UTC (rev 5857)
+++ trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml       
2011-10-05 13:39:44 UTC (rev 5858)
@@ -54,7 +54,7 @@
                resultMap="select-results">
     <![CDATA[
         select sender, receiver, sent, loss, lostPercent, duplicates, 
minDelay, medDelay, maxDelay, delayUnits, error, errorUnits, jitter, 
jitterUnits, hops 
-        from owamp 
+        from owamp_agg 
         where metadataId = ?
     ]]>
        </select>
@@ -72,7 +72,7 @@
                <parameter property="duplicates" />
                <parameter property="minDelay" />
                <parameter property="medDelay" />
-               <parameter property="maxDelay " />
+               <parameter property="maxDelay" />
                <parameter property="delayUnits" />
                <parameter property="error" />
                <parameter property="errorUnits" />