perfsonar development work

Author: roman
Date: 2006-09-01 07:14:39 -0400 (Fri, 01 Sep 2006)
New Revision: 1590

Modified:
   trunk/perfsonar/conf/ibatis-L2-status-domain.xml
   trunk/perfsonar/conf/ibatis-L2-status-interdomain.xml
   
trunk/perfsonar/schema/example-instances/sonar/MeasurementArchiveStore-L2status-Req-1.xml
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
Log:
Now SQL MA can accept a request of type MeasurementArchiveStoreReqyest which 
contain datum elements from ifevt namespace

Modified: trunk/perfsonar/conf/ibatis-L2-status-domain.xml
===================================================================
--- trunk/perfsonar/conf/ibatis-L2-status-domain.xml    2006-09-01 08:12:20 
UTC (rev 1589)
+++ trunk/perfsonar/conf/ibatis-L2-status-domain.xml    2006-09-01 11:14:39 
UTC (rev 1590)
@@ -97,7 +97,8 @@
   <parameterMap id="insert-parameters" class="java.util.HashMap">
     <parameter property="pathId" />
     <parameter property="timeValue" />
-    <parameter property="value" />
+    <parameter property="stateOper" />
+    <parameter property="stateAdmin" />
   </parameterMap>
 
 
@@ -105,8 +106,8 @@
   <insert id="setResults"
           parameterMap="insert-parameters">
     <![CDATA[
-        insert into domain_link (id, time, status_oper)
-        values (?, from_unixtime(?), ?)
+        insert into domain_link (id, time, status_oper, status_admin)
+        values (?, from_unixtime(?), ?, ?)
     ]]>
   </insert>
 
@@ -116,8 +117,8 @@
   <insert id="setResults"
     parameterMap="insert-parameters">
     <![CDATA[
-        insert into domain_link (id, time, status_oper)
-        values (?, to_timestamp(?), ?)
+        insert into domain_link (id, time, status_oper, status_admin)
+        values (?, to_timestamp(?), ?, ?)
     ]]>
   </insert>
   -->

Modified: trunk/perfsonar/conf/ibatis-L2-status-interdomain.xml
===================================================================
--- trunk/perfsonar/conf/ibatis-L2-status-interdomain.xml       2006-09-01 
08:12:20 UTC (rev 1589)
+++ trunk/perfsonar/conf/ibatis-L2-status-interdomain.xml       2006-09-01 
11:14:39 UTC (rev 1590)
@@ -97,7 +97,8 @@
   <parameterMap id="insert-parameters" class="java.util.HashMap">
     <parameter property="pathId" />
     <parameter property="timeValue" />
-    <parameter property="value" />
+    <parameter property="stateOper" />
+    <parameter property="stateAdmin" />
   </parameterMap>
 
 
@@ -105,8 +106,8 @@
   <insert id="setResults"
           parameterMap="insert-parameters">
     <![CDATA[
-        insert into interdomain_link (id, time, status_oper)
-        values (?, from_unixtime(?), ?)
+        insert into interdomain_link (id, time, status_oper, status_admin)
+        values (?, from_unixtime(?), ?, ?)
     ]]>
   </insert>
 
@@ -116,8 +117,8 @@
   <insert id="setResults"
     parameterMap="insert-parameters">
     <![CDATA[
-        insert into interdomain_link (id, time, status_oper)
-        values (?, to_timestamp(?), ?)
+        insert into interdomain_link (id, time, status_oper, status_admin)
+        values (?, to_timestamp(?), ?, ?)
     ]]>
   </insert>
   -->

Modified: 
trunk/perfsonar/schema/example-instances/sonar/MeasurementArchiveStore-L2status-Req-1.xml
===================================================================
--- 
trunk/perfsonar/schema/example-instances/sonar/MeasurementArchiveStore-L2status-Req-1.xml
   2006-09-01 08:12:20 UTC (rev 1589)
+++ 
trunk/perfsonar/schema/example-instances/sonar/MeasurementArchiveStore-L2status-Req-1.xml
   2006-09-01 11:14:39 UTC (rev 1590)
@@ -9,7 +9,8 @@
               type="MeasurementArchiveStoreRequest"
               xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; 
               xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
-              xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>
+              xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+              xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>
 
 
   <nmwg:metadata id="meta1">
@@ -23,7 +24,10 @@
 
 
   <nmwg:data id="data1" metadataIdRef="meta1">
-    <nmwg:datum value="up" timeValue="1149071682" timeType="unix" />
+    <ifevt:datum timeType="unix" timeValue="1157107685">
+      <ifevt:stateAdmin>TEST2</ifevt:stateAdmin>
+      <ifevt:stateOper>up</ifevt:stateOper>
+    </ifevt:datum>
   </nmwg:data>
 
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
     2006-09-01 08:12:20 UTC (rev 1589)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
     2006-09-01 11:14:39 UTC (rev 1590)
@@ -8,7 +8,7 @@
 import java.util.Map;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.ggf.ns.nmwg.base.v2_0.Datum;
+import org.ggf.ns.nmwg.event.status.base.v2_0.Datum;
 
 import org.perfsonar.service.commons.exceptions.SystemException;
 
@@ -39,21 +39,15 @@
 
     public Map prepareStoreParameters(Element datum, Map ibatisParams) {
 
-        String strValue   = ((Datum)datum).getValue();
-        String valueUnits = ((Datum)datum).getValueUnits();
         String timeValue  = ((Datum)datum).getTimeValue();
 
-        ibatisParams.put("valueUnits", valueUnits);
+        String stateAdmin = ((Datum)datum).getStateAdmin().getStateAdmin();
+        String stateOper = ((Datum)datum).getStateOper().getStateOper();
+
         ibatisParams.put("timeValue", Integer.parseInt(timeValue));
 
-        try {
-            // or a float
-            ibatisParams.put("value", Float.parseFloat(strValue));
-        } catch (Exception ex) {
-            //logger.debug("SQLStorageManager.store: " + ex.toString());
-            // value is a string ...
-            ibatisParams.put("value", strValue);
-        }
+        ibatisParams.put("stateAdmin", stateAdmin);
+        ibatisParams.put("stateOper", stateOper);
 
         return ibatisParams;