perfsonar development work

Author: psnc.pikusa
Date: 2011-10-04 17:21:06 +0100 (Tue, 04 Oct 2011)
New Revision: 5849

Modified:
   trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml
Log:
Changes in mapping and queries due to OWAMP MP requirements for one of two 
cases

Modified: trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml      2011-10-04 
16:15:22 UTC (rev 5848)
+++ trunk/perfsonar-java-sql-ma/conf/ibatis-clmp-owamp.xml      2011-10-04 
16:21:06 UTC (rev 5849)
@@ -25,30 +25,30 @@
   </resultMap>
 
 
-  <!--  <parameterMap id="select-parameters1" class="java.util.HashMap">
+   <parameterMap id="select-parameters1" class="java.util.HashMap">
     <parameter property="metadataId" />
     <parameter property="startTime" />
     <parameter property="endTime" />
   </parameterMap>
--->
 
+
   <parameterMap id="select-parameters2" class="java.util.HashMap">
     <parameter property="metadataId" />
   </parameterMap>
 
-<!--    <select id="getResults1"
+    <select id="getResults1"
           parameterMap="select-parameters1" resultMap="select-results">
     <![CDATA[
         select receiveSynchronized, receiveTime, receiveTimeError, 
sendSynchronized, sendTime, sendTimeError, seqNum, timeType, timeValue, ttl 
         from clmp_owamp 
         where metadataId = ?
-       and timeValue >= ?
-        and timeValue <= ?
-        order by timeValue ASC                                               
                          
+               and ts >= ?
+        and ts <= ?
+        order by ts ASC                                                      
                          
     ]]>
   </select>
--->
 
+
   <select id="getResults2"
           parameterMap="select-parameters2" resultMap="select-results">
     <![CDATA[
@@ -72,9 +72,9 @@
     <parameter property="sendTime" />
     <parameter property="sendTimeError" />
     <parameter property="seqNum" />
-    <parameter property="timeType" />
-    <parameter property="timeValue" />
-    <parameter property="ttl" />
+    <!-- <parameter property="timeType" />
+    <parameter property="timeValue" />  -->
+    <parameter property="ttl" />  
   </parameterMap>
 
 
@@ -82,7 +82,7 @@
           parameterMap="insert-parameters">
     <![CDATA[
         insert into owamp (metadataId, receiveSynchronized, receiveTime, 
receiveTimeError, sendSynchronized, sendTime, sendTimeError, seqNum, ttl, ts )
-        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, default)
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?, default)
     ]]>
   </insert>